diff --git a/sdk/xtdk/xtbmapi.h b/sdk/xtdk/xtbmapi.h
index 8ab3f07..d0de696 100644
--- a/sdk/xtdk/xtbmapi.h
+++ b/sdk/xtdk/xtbmapi.h
@@ -12,8 +12,31 @@
 #include <xttarget.h>
 #include <xttypes.h>
 
+/* XT forward references */
+#include <xtstruct.h>
+
+/* Architecture-specific XT forward references */
+#include ARCH_HEADER(xtstruct.h)
+
 /* Architecture-independent XT API */
 #include <xtbase.h>
 #include <xtfw.h>
 #include <xtimage.h>
 #include <xtuefi.h>
+#include <xtdebug.h>
+#include <xtguid.h>
+
+/* Architecture independent XT kernel data types */
+#include <hltypes.h>
+#include <rtltypes.h>
+
+/* Architecture dependent XT kernel data types */
+#include ARCH_HEADER(artypes.h)
+#include ARCH_HEADER(hltypes.h)
+
+/* XT Kernel runtime routines */
+#include <rtlfuncs.h>
+
+/* Architecture specific XT kernel routines */
+#include ARCH_HEADER(arfuncs.h)
+#include ARCH_HEADER(hlfuncs.h)