diff --git a/xtldr/modules/dummy/dummy.c b/xtldr/modules/dummy/dummy.c
index 0468380..0628827 100644
--- a/xtldr/modules/dummy/dummy.c
+++ b/xtldr/modules/dummy/dummy.c
@@ -6,8 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtblapi.h>
-#include <globals.h>
+#include <dummy.h>
 
 
 /* Dummy module information */
diff --git a/xtldr/modules/dummy/globals.c b/xtldr/modules/dummy/globals.c
index d693509..595be67 100644
--- a/xtldr/modules/dummy/globals.c
+++ b/xtldr/modules/dummy/globals.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtblapi.h>
+#include <dummy.h>
 
 
 /* XTLDR protocol handler */
diff --git a/xtldr/modules/dummy/includes/dummy.h b/xtldr/modules/dummy/includes/dummy.h
new file mode 100644
index 0000000..675bdbc
--- /dev/null
+++ b/xtldr/modules/dummy/includes/dummy.h
@@ -0,0 +1,26 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtldr/modules/dummy/includes/dummy.h
+ * DESCRIPTION:     XTLDR Dummy Module header file
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTLDR_DUMMY_DUMMY_H
+#define __XTLDR_DUMMY_DUMMY_H
+
+#include <xtblapi.h>
+#include <globals.h>
+
+
+/* Dummy module routines forward references */
+XTCDECL
+EFI_STATUS
+BlBootDummyOS(IN PXTBL_BOOT_PARAMETERS Parameters);
+
+XTCDECL
+EFI_STATUS
+XtLdrModuleMain(IN EFI_HANDLE ImageHandle,
+                IN PEFI_SYSTEM_TABLE SystemTable);
+
+#endif/* __XTLDR_DUMMY_DUMMY_H */
diff --git a/xtldr/modules/dummy/includes/globals.h b/xtldr/modules/dummy/includes/globals.h
index fcb72c1..8fd8446 100644
--- a/xtldr/modules/dummy/includes/globals.h
+++ b/xtldr/modules/dummy/includes/globals.h
@@ -2,14 +2,14 @@
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
  * FILE:            xtldr/modules/dummy/includes/globals.h
- * DESCRIPTION:     Dummy XTLDR module global variables
+ * DESCRIPTION:     XTLDR Dummy Module global variables
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
 #ifndef __XTLDR_DUMMY_GLOBALS_H
 #define __XTLDR_DUMMY_GLOBALS_H
 
-#include <xtblapi.h>
+#include <dummy.h>
 
 
 /* XTLDR protocol handler */