diff --git a/include/bl31/context.h b/include/bl31/context.h
index cb4cd8e..b0c9810 100644
--- a/include/bl31/context.h
+++ b/include/bl31/context.h
@@ -31,8 +31,8 @@
 #ifndef __CONTEXT_H__
 #define __CONTEXT_H__
 
-#include <bl_common.h>
 #include <arch.h>
+#include <cassert.h>
 
 /*******************************************************************************
  * Constants that allow assembler code to access members of and the 'gp_regs'
diff --git a/include/bl31/runtime_svc.h b/include/bl31/runtime_svc.h
index 148c0bc..ab2137d 100644
--- a/include/bl31/runtime_svc.h
+++ b/include/bl31/runtime_svc.h
@@ -31,7 +31,7 @@
 #ifndef __RUNTIME_SVC_H__
 #define __RUNTIME_SVC_H__
 #include <psci.h>
-#include <bl_common.h>
+#include <cassert.h>
 
 /*******************************************************************************
  * Bit definitions inside the function id as per the SMC calling convention