diff --git a/Makefile b/Makefile
index bdfb4f042ad486d6c03a52061a371594d5e355b7..49d7cc4b365f4c76b378a7a4b4b5856022ed3ef5 100644
--- a/Makefile
+++ b/Makefile
@@ -250,6 +250,7 @@ INCLUDES		+=	-Iinclude/bl1				\
 				-Iinclude/lib/cpus/${ARCH}		\
 				-Iinclude/lib/el3_runtime		\
 				-Iinclude/lib/el3_runtime/${ARCH}	\
+				-Iinclude/lib/pmf			\
 				-Iinclude/lib/psci			\
 				-Iinclude/plat/common			\
 				-Iinclude/services			\
diff --git a/include/lib/pmf.h b/include/lib/pmf/pmf.h
similarity index 100%
rename from include/lib/pmf.h
rename to include/lib/pmf/pmf.h
diff --git a/include/lib/pmf_helpers.h b/include/lib/pmf/pmf_helpers.h
similarity index 100%
rename from include/lib/pmf_helpers.h
rename to include/lib/pmf/pmf_helpers.h