diff --git a/services/spd/tspd/tspd.mk b/services/spd/tspd/tspd.mk
index 532e168..02446a3 100644
--- a/services/spd/tspd/tspd.mk
+++ b/services/spd/tspd/tspd.mk
@@ -29,8 +29,7 @@
 #
 
 TSPD_DIR		:=	services/spd/tspd
-SPD_INCLUDES		:=	-Iinclude/bl32/payloads	\
-				-I${TSPD_DIR}
+SPD_INCLUDES		:=	-Iinclude/bl32/payloads
 
 SPD_SOURCES		:=	tspd_common.c		\
 				tspd_main.c		\
diff --git a/services/spd/tspd/tspd_common.c b/services/spd/tspd/tspd_common.c
index b806543..fcc2765 100644
--- a/services/spd/tspd/tspd_common.c
+++ b/services/spd/tspd/tspd_common.c
@@ -37,7 +37,7 @@
 #include <bl_common.h>
 #include <runtime_svc.h>
 #include <context_mgmt.h>
-#include <tspd_private.h>
+#include "tspd_private.h"
 
 /*******************************************************************************
  * Given a secure payload entrypoint, register width, cpu id & pointer to a
diff --git a/services/spd/tspd/tspd_helpers.S b/services/spd/tspd/tspd_helpers.S
index 27fbb5a..f9a32aa 100644
--- a/services/spd/tspd/tspd_helpers.S
+++ b/services/spd/tspd/tspd_helpers.S
@@ -29,9 +29,9 @@
  */
 
 #include <context.h>
-#include <tspd_private.h>
 #include <asm_macros.S>
 #include <cm_macros.S>
+#include "tspd_private.h"
 
 	.global	tspd_enter_sp
 	/* ---------------------------------------------
diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c
index 543266e..90fa094 100644
--- a/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@ -49,9 +49,9 @@
 #include <bl31.h>
 #include <tsp.h>
 #include <psci.h>
-#include <tspd_private.h>
 #include <debug.h>
 #include <uuid.h>
+#include "tspd_private.h"
 
 /*******************************************************************************
  * Single structure to hold information about the various entry points into the
diff --git a/services/spd/tspd/tspd_pm.c b/services/spd/tspd/tspd_pm.c
index 4ebafc7..6a07aa2 100644
--- a/services/spd/tspd/tspd_pm.c
+++ b/services/spd/tspd/tspd_pm.c
@@ -39,8 +39,8 @@
 #include <bl31.h>
 #include <bl32.h>
 #include <psci.h>
-#include <tspd_private.h>
 #include <debug.h>
+#include "tspd_private.h"
 
 /*******************************************************************************
  * The target cpu is being turned on. Allow the TSPD/TSP to perform any actions