diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios.c b/reactos/subsystems/mvdm/ntvdm/bios/bios.c
index 598be0b8568..9ee04e264d7 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios.c
@@ -6,11 +6,25 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/callback.h"
+#include "cpu/bop.h"
+
+#include "bios.h"
+#include "bios32/bios32.h"
+#include "rom.h"
+#include "umamgr.h"
+
+#include "io.h"
+#include "hardware/cmos.h"
+
 #include <stdlib.h>
 
 /* DEFINES ********************************************************************/
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios.h b/reactos/subsystems/mvdm/ntvdm/bios/bios.h
index 060ec0ab2b4..8182a0779f1 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios.h
@@ -9,6 +9,11 @@
 #ifndef _BIOS_H_
 #define _BIOS_H_
 
+/* INCLUDES *******************************************************************/
+
+#include "kbdbios.h"
+#include "vidbios.h"
+
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
@@ -160,4 +165,6 @@ BiosInitialize(IN LPCSTR BiosFileName,
 VOID
 BiosCleanup(VOID);
 
-#endif /* _BIOS_H_ */
+#endif // _BIOS_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
index 556d47607d2..436ac2122b3 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
@@ -7,11 +7,39 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
+/* BIOS Version number and Copyright */
+#include <reactos/buildno.h>
+#include <reactos/version.h>
+
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/cpu.h" // for EMULATOR_FLAG_CF
+#include "cpu/bop.h"
+#include "int32.h"
+#include <isvbop.h>
+
+#include <bios/bios.h>
+#include <bios/rom.h>
+#include "bios32.h"
+#include "bios32p.h"
+#include "dskbios32.h"
+#include "kbdbios32.h"
+#include "vidbios32.h"
+#include "moubios32.h"
+
+#include "memory.h"
+#include "io.h"
+#include "hardware/cmos.h"
+#include "hardware/pic.h"
+#include "hardware/pit.h"
+#include "hardware/ps2.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 CALLBACK16 BiosContext;
@@ -137,7 +165,7 @@ static const BYTE PostCode[] =
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-static VOID Bios32CharPrint(CHAR Character)
+static VOID BiosCharPrint(CHAR Character)
 {
     /* Save AX and BX */
     USHORT AX = getAX();
@@ -506,7 +534,7 @@ static VOID WINAPI BiosMiscService(LPWORD Stack)
 
 static VOID WINAPI BiosRomBasic(LPWORD Stack)
 {
-    PrintMessageAnsi(Bios32CharPrint, "FATAL: INT18: BOOT FAILURE.");
+    PrintMessageAnsi(BiosCharPrint, "FATAL: INT18: BOOT FAILURE.");
 
     /* ROM Basic is unsupported, display a message to the user */
     DisplayMessage(L"NTVDM doesn't support ROM Basic. The VDM is closing.");
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h
index 2205b4200a3..6030361cf28 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h
@@ -9,6 +9,10 @@
 #ifndef _BIOS32_H_
 #define _BIOS32_H_
 
+/* INCLUDES *******************************************************************/
+
+// #include <bios/bios.h>
+
 /* DEFINES ********************************************************************/
 
 enum
@@ -37,4 +41,6 @@ typedef struct
 BOOLEAN Bios32Initialize(VOID);
 VOID Bios32Cleanup(VOID);
 
-#endif /* _BIOS32_H_ */
+#endif // _BIOS32_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
index bc4e25f3239..28d1a45a13a 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
@@ -9,6 +9,12 @@
 #ifndef _BIOS32P_H_
 #define _BIOS32P_H_
 
+/* INCLUDES *******************************************************************/
+
+#include <bios/bios.h>
+
+/**/ #include "int32.h" /**/
+
 /* DEFINES ********************************************************************/
 
 #define BIOS_PIC_MASTER_INT 0x08
@@ -36,4 +42,6 @@ do { \
 VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func);
 VOID PicIRQComplete(BYTE IntNum);
 
-#endif /* _BIOS32P_H_ */
+#endif // _BIOS32P_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
index fa2864f44bd..9bc83c08801 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
@@ -6,11 +6,26 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+// #include "../../memory.h"
+// #include "cpu/bop.h"
+#include "cpu/cpu.h" // for EMULATOR_FLAG_ZF
+#include "int32.h"
+
+#include "dskbios32.h"
+// #include <bios/dskbios.h>
+#include "bios32p.h"
+
+#include "hardware/disk.h"
+
+
 /* DEFINES ********************************************************************/
 
 // Disks which are currently supported by the BIOS Disk module.
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
index 59217551726..af4c57c288b 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
@@ -6,11 +6,22 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "kbdbios32.h"
+#include <bios/kbdbios.h>
+#include "bios32p.h"
+
+#include "int32.h"
+#include "cpu/cpu.h" // for EMULATOR_FLAG_ZF
+#include "io.h"
+#include "hardware/ps2.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static BYTE BiosKeyboardMap[256];
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
index 8a927083e2c..559101e4667 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
@@ -9,11 +9,23 @@
  * NOTE: Based from VirtualBox OSE ROM BIOS, and SeaBIOS.
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/cpu.h" // for EMULATOR_FLAG_CF
+
+#include "moubios32.h"
+#include "bios32p.h"
+
+#include "io.h"
+#include "hardware/mouse.h"
+#include "hardware/ps2.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 #define MOUSE_IRQ_INT   0x74
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
index ca1c06fb6a8..a7d656ce351 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
@@ -6,11 +6,20 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/cpu.h"
+
+#include "vbe.h"
+
+#include "io.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static const VBE_MODE Modes[VBE_MODE_COUNT] = {
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h
index c658c137e75..b5198e91c07 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h
@@ -9,6 +9,8 @@
 #ifndef _VBE_H_
 #define _VBE_H_
 
+#include "hardware/video/svga.h"
+
 /* DEFINITIONS ****************************************************************/
 
 #define OEM_NAME     "Cirrus Logic GD-5434 VGA"
@@ -103,4 +105,4 @@ typedef struct _VBE_MODE
 VOID WINAPI VbeService(LPWORD Stack);
 BOOLEAN VbeInitialize(VOID);
 
-#endif /* _VBE_H_ */
+#endif // _VBE_H_
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
index faa6ed9ac53..f9405d484f1 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
@@ -8,11 +8,21 @@
  * NOTE:            All of the real code is in bios/vidbios.c
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/bop.h"
+#include "int32.h"
+
+#include "vidbios32.h"
+#include <bios/vidbios.h>
+#include "bios32p.h"
+
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
index ab90cdf3c2c..504984a15de 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
@@ -6,11 +6,20 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/bop.h"
+#include "int32.h"
+
+#include "bios.h"
+// #include "kbdbios.h"
+
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/rom.c b/reactos/subsystems/mvdm/ntvdm/bios/rom.c
index 7bba14f9a41..6fbf272d142 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/rom.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/rom.c
@@ -6,11 +6,20 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "memory.h"
+#include "cpu/callback.h"
+#include "rom.h"
+
+#include "utils.h"
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static BOOLEAN FASTCALL ShadowRomWrite(ULONG Address, PVOID Buffer, ULONG Size)
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
index d7f5fbeffe8..06d0a17e1ed 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
@@ -9,11 +9,18 @@
  *       indirectly by the DOS EMS Driver, and by VDD memory management functions.
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "memory.h"
+
+#include "umamgr.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _UMA_DESCRIPTOR
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
index a42f587e2bf..e4cdc370c8b 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
@@ -7,11 +7,32 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+/* BIOS Version number and Copyright */
+#include <reactos/buildno.h>
+#include <reactos/version.h>
+
+#include "emulator.h"
+#include "cpu/cpu.h"
+#include "cpu/bop.h"
+#include "memory.h"
+
+#include "bios.h"
+#include "bios32/bios32p.h"
+#include "rom.h"
+#include "bios32/vbe.h"
+// #include "vidbios.h"
+#include "bios32/vidbios32.h"
+
+#include "io.h"
+#include "hardware/video/svga.h"
+
 /* MACROS *********************************************************************/
 
 //
diff --git a/reactos/subsystems/mvdm/ntvdm/clock.c b/reactos/subsystems/mvdm/ntvdm/clock.c
index 495674ddbf3..84d63915e90 100644
--- a/reactos/subsystems/mvdm/ntvdm/clock.c
+++ b/reactos/subsystems/mvdm/ntvdm/clock.c
@@ -7,11 +7,23 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "clock.h"
+
+#include "cpu/cpu.h"
+#include "hardware/cmos.h"
+#include "hardware/ps2.h"
+#include "hardware/pit.h"
+#include "hardware/video/svga.h"
+#include "hardware/mouse.h"
+
 /* DEFINES ********************************************************************/
 
 /*
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/bop.c b/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
index 8d165131fcf..dc64f9b519c 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
@@ -7,11 +7,16 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "bop.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 /*
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/callback.c b/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
index 9d5905fe3d4..00c89799897 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
@@ -15,11 +15,20 @@
 |   with the CPU registers is 100% prone to bugs!!
 \******************************************************************************/
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "callback.h"
+
+#include "cpu.h"
+#include "bop.h"
+#include <isvbop.h>
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static BYTE Yield[] =
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
index 07d38c5aeae..212f522d0a4 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
@@ -6,11 +6,34 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu.h"
+
+#include "memory.h"
+#include "callback.h"
+#include "bop.h"
+#include <isvbop.h>
+
+#include "clock.h"
+#include "bios/rom.h"
+#include "hardware/cmos.h"
+#include "hardware/keyboard.h"
+#include "hardware/mouse.h"
+#include "hardware/pic.h"
+#include "hardware/ps2.h"
+#include "hardware/sound/speaker.h"
+#include "hardware/pit.h"
+#include "hardware/video/svga.h"
+
+#include "io.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 FAST486_STATE EmulatorContext;
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h
index 04ef5034a43..28cd635e96f 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h
@@ -9,6 +9,10 @@
 #ifndef _CPU_H_
 #define _CPU_H_
 
+/* INCLUDES *******************************************************************/
+
+#include <fast486.h>
+
 /* DEFINES ********************************************************************/
 
 /* FLAGS */
@@ -70,4 +74,6 @@ VOID EmulatorTerminate(VOID);
 BOOLEAN CpuInitialize(VOID);
 VOID CpuCleanup(VOID);
 
-#endif /* _CPU_H_ */
+#endif // _CPU_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/registers.c b/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
index fd6bf3ad0e0..88c7183edc3 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
@@ -6,11 +6,15 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu.h"
 #include "x86context.h"
 
 /* PRIVATE VARIABLES **********************************************************/
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dem.c b/reactos/subsystems/mvdm/ntvdm/dos/dem.c
index 0608f56ba23..0ed51c292ba 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dem.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dem.c
@@ -10,11 +10,30 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include <isvbop.h>
+
+#include "utils.h"
+
+#include "dem.h"
+#include "dos/dos32krnl/device.h"
+#include "dos/dos32krnl/memory.h"
+#include "dos/dos32krnl/process.h"
+#include "cpu/bop.h"
+#include "cpu/cpu.h"
+
+#include "bios/bios.h"
+#include "mouse32.h"
+
+#include "vddsup.h"
+
 /*
  * EXPERIMENTAL!
  * Activate this line if you want to have COMMAND.COM completely external.
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dem.h b/reactos/subsystems/mvdm/ntvdm/dos/dem.h
index 56356a35f10..befbe80dc61 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dem.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dem.h
@@ -13,6 +13,10 @@
 #ifndef _DEM_H_
 #define _DEM_H_
 
+/* INCLUDES *******************************************************************/
+
+#include "dos32krnl/dos.h"
+
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
@@ -97,4 +101,6 @@ demSetCurrentDirectoryGetDrive
     OUT PUCHAR DriveNumber
 );
 
-#endif /* _DEM_H_ */
+#endif // _DEM_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
index e7ab8b0c8f9..bf28310e784 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
@@ -6,11 +6,23 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "int32.h"
+
+#include "../dem.h"
+#include "dos.h"
+#include "dosfiles.h"
+#include "handle.h"
+#include "memory.h"
+#include "bios/bios.h"
+
 // This is needed because on UNICODE this symbol is redirected to
 // GetEnvironmentStringsW whereas on ANSI it corresponds to the real
 // "ANSI" function (and GetEnvironmentStringsA is aliased to it).
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
index 8f0245190a5..ae8d419ab84 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
@@ -7,11 +7,20 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+
+#include "bios/bios.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 PDOS_DEVICE_NODE Con = NULL;
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
index a436b7343cd..334c04c20f4 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
@@ -9,11 +9,18 @@
  *                  For other languages, please use COUNTRY.SYS
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+
+#include "country.h"
+#include "memory.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 /* CaseMap routine: should call INT 65h, AL=20h */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
index 66cb64fb825..71fbdcef1aa 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
@@ -6,11 +6,21 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/bop.h"
+#include "device.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "memory.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static const BYTE StrategyRoutine[] = {
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
index 77a4db126fb..d5b01ce7fbf 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
@@ -7,11 +7,34 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/cpu.h"
+#include "int32.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "country.h"
+#include "device.h"
+#include "handle.h"
+#include "dosfiles.h"
+#include "memory.h"
+#include "process.h"
+#include "himem.h"
+
+#include "bios/bios.h"
+
+#include "io.h"
+#include "hardware/ps2.h"
+
+#include "emsdrv.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 CALLBACK16 DosContext;
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h
index bc335f9977c..18e50077d4a 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h
@@ -9,6 +9,12 @@
 #ifndef _DOS_H_
 #define _DOS_H_
 
+/* INCLUDES *******************************************************************/
+
+#include "device.h"
+
+/**/ #include "int32.h" /**/
+
 /* DEFINES ********************************************************************/
 
 //
@@ -327,4 +333,6 @@ VOID DosEchoCharacter(CHAR Character);
  */
 BOOLEAN DosKRNLInitialize(VOID);
 
-#endif /* _DOS_H_ */
+#endif // _DOS_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
index 4c69c834695..1dda966210a 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
@@ -7,11 +7,24 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "../../memory.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "dosfiles.h"
+#include "handle.h"
+#include "process.h"
+
+#include "bios/bios.h"
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static VOID StoreNameInSft(LPCSTR FilePath, PDOS_FILE_DESCRIPTOR Descriptor)
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
index 67dd546cfa8..bc22ce8eb0f 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
@@ -9,11 +9,23 @@
  *                  LIM EMS v4.0: http://www.phatcode.net/res/218/files/limems40.txt
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "../../memory.h"
+#include "bios/umamgr.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "device.h"
+
+#include "emsdrv.h"
+
 #define EMS_DEVICE_NAME     "EMMXXXX0"
 
 #define EMS_SEGMENT_SIZE    ((EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE) >> 4)
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
index 378fc84a9f8..45ca0bc7769 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
@@ -6,11 +6,22 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "dosfiles.h"
+#include "handle.h"
+#include "memory.h"
+#include "process.h"
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 /* Taken from base/shell/cmd/console.c */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
index d6143b06f2c..19216eda0cd 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
@@ -44,11 +44,21 @@
  * of the internal Upper Memory Area Manager, in umamgr.c
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/bop.h"
+#include "../../memory.h"
+#include "bios/umamgr.h"
+
+#include "device.h"
+#include "himem.h"
+
 #define XMS_DEVICE_NAME "XMSXXXX0"
 
 /* BOP Identifiers */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
index 99f8704e766..b7cf0a5b95f 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
@@ -7,11 +7,23 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+
+#include "bios/umamgr.h" // HACK until we correctly call XMS services for UMBs.
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "memory.h"
+#include "process.h"
+#include "himem.h"
+
 // FIXME: Should be dynamically initialized!
 #define FIRST_MCB_SEGMENT   (SYSTEM_ENV_BLOCK + 0x200)  // old value: 0x1000
 #define USER_MEMORY_SIZE    (0x9FFE - FIRST_MCB_SEGMENT)
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
index 50e725dbd26..f15b24f1f0f 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
@@ -7,11 +7,30 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cpu/cpu.h"
+
+#include "dos.h"
+#include "dos/dem.h"
+#include "dosfiles.h"
+#include "handle.h"
+#include "process.h"
+#include "memory.h"
+
+#include "bios/bios.h"
+
+#include "io.h"
+#include "hardware/ps2.h"
+
+#include "vddsup.h"
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static VOID DosInitPsp(IN WORD Segment,
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
index 3f378c3cf7b..f704ed2d0c1 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
@@ -6,11 +6,34 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+/* Driver Version number and Copyright */
+#include <reactos/buildno.h>
+#include <reactos/version.h>
+
+#include "emulator.h"
+
+#include "cpu/cpu.h"
+#include "int32.h"
+#include "hardware/mouse.h"
+#include "hardware/ps2.h"
+#include "hardware/pic.h"
+#include "hardware/video/svga.h"
+
+#include "mouse32.h"
+#include "bios/bios.h"
+#include "bios/bios32/bios32p.h"
+
+#include "memory.h"
+#include "io.h"
+#include "dos32krnl/memory.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static const CHAR MouseCopyright[] =
diff --git a/reactos/subsystems/mvdm/ntvdm/emulator.c b/reactos/subsystems/mvdm/ntvdm/emulator.c
index 75a4a7e1ab0..dd92213a698 100644
--- a/reactos/subsystems/mvdm/ntvdm/emulator.c
+++ b/reactos/subsystems/mvdm/ntvdm/emulator.c
@@ -6,11 +6,40 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "memory.h"
+
+#include "cpu/callback.h"
+#include "cpu/cpu.h"
+#include "cpu/bop.h"
+#include <isvbop.h>
+
+#include "int32.h"
+
+#include "clock.h"
+#include "bios/rom.h"
+#include "hardware/cmos.h"
+#include "hardware/disk.h"
+#include "hardware/dma.h"
+#include "hardware/keyboard.h"
+#include "hardware/mouse.h"
+#include "hardware/pic.h"
+#include "hardware/pit.h"
+#include "hardware/ppi.h"
+#include "hardware/ps2.h"
+#include "hardware/sound/speaker.h"
+#include "hardware/video/svga.h"
+
+#include "vddsup.h"
+#include "io.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 LPVOID  BaseAddress = NULL;
diff --git a/reactos/subsystems/mvdm/ntvdm/emulator.h b/reactos/subsystems/mvdm/ntvdm/emulator.h
index e5abc9ea3ba..deff274d4fa 100644
--- a/reactos/subsystems/mvdm/ntvdm/emulator.h
+++ b/reactos/subsystems/mvdm/ntvdm/emulator.h
@@ -9,6 +9,10 @@
 #ifndef _EMULATOR_H_
 #define _EMULATOR_H_
 
+/* INCLUDES *******************************************************************/
+
+#include <fast486.h>
+
 /* DEFINES ********************************************************************/
 
 /* Basic Memory Management */
@@ -117,4 +121,6 @@ VOID EmulatorTerminate(VOID);
 BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput);
 VOID EmulatorCleanup(VOID);
 
-#endif /* _EMULATOR_H_ */
+#endif // _EMULATOR_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
index c7fff9f9bb3..8482553c08e 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
@@ -6,11 +6,20 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "cmos.h"
+
+#include "io.h"
+#include "pic.h"
+#include "clock.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static HANDLE hCmosRam = INVALID_HANDLE_VALUE;
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/disk.c b/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
index 135df9b9bdf..0b230480248 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
@@ -18,11 +18,22 @@
  *         in little endian) *MUST* be fixed!
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "disk.h"
+
+// #include "io.h"
+#include "memory.h"
+
+#include "utils.h"
+
+
 /**************** HARD DRIVES -- VHD FIXED DISK FORMAT SUPPORT ****************/
 
 // http://citrixblogger.org/2008/12/01/dynamic-vhd-walkthrough/
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/dma.c b/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
index 9e9b4346d47..c2816adcc6e 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
@@ -7,11 +7,19 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "dma.h"
+
+#include "io.h"
+#include "memory.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 /*
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
index a2230f5ce6a..6d18b9da897 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
@@ -6,11 +6,16 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "keyboard.h"
+#include "ps2.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static BOOLEAN Reporting = FALSE;
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
index a8df154b2e3..624cdbba203 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
@@ -6,11 +6,19 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "mouse.h"
+#include "ps2.h"
+
+#include "clock.h"
+#include "video/svga.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static const BYTE ScrollMagic[3]      = { 200, 100, 80 };
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/pic.c b/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
index a17a93ff72b..63ac9d60fe9 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
@@ -7,11 +7,18 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "pic.h"
+
+#include "io.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _PIC
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/pit.c b/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
index 1a28f291d7c..540ecec14a5 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
@@ -8,11 +8,20 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "pit.h"
+
+#include "io.h"
+#include "pic.h"
+#include "clock.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static PIT_CHANNEL PitChannels[PIT_CHANNELS];
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
index e3fa3d7b873..fbab101931a 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
@@ -11,11 +11,21 @@
  *        - This controller is here only for having ports 61h and 62h working.
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "ppi.h"
+
+#include "hardware/pit.h"
+#include "hardware/sound/speaker.h"
+
+#include "io.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 /*static*/ BYTE Port61hState = 0x00; // Used in emulator.c
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
index 74312c2b089..4222cc5ed8a 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
@@ -11,11 +11,21 @@
  *                  http://www.computer-engineering.org/ps2keyboard/
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "ps2.h"
+
+#include "memory.h"
+#include "io.h"
+#include "pic.h"
+#include "clock.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 #define BUFFER_SIZE 32
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
index ac035fc3065..f99918b0a0d 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
@@ -6,11 +6,16 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "speaker.h"
+#include "hardware/pit.h"
+
 /* Extra PSDK/NDK Headers */
 #include <ndk/iofuncs.h>
 
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
index 712edd22ea7..f5b06ca7988 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
@@ -6,11 +6,21 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "svga.h"
+#include <bios/vidbios.h>
+
+#include "memory.h"
+#include "io.h"
+#include "clock.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 };
diff --git a/reactos/subsystems/mvdm/ntvdm/int32.c b/reactos/subsystems/mvdm/ntvdm/int32.c
index 3ba666d3b94..0081765a669 100644
--- a/reactos/subsystems/mvdm/ntvdm/int32.c
+++ b/reactos/subsystems/mvdm/ntvdm/int32.c
@@ -7,11 +7,19 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "int32.h"
+
+#include "cpu/bop.h"
+#include <isvbop.h>
+
 /* PRIVATE VARIABLES **********************************************************/
 
 /*
diff --git a/reactos/subsystems/mvdm/ntvdm/int32.h b/reactos/subsystems/mvdm/ntvdm/int32.h
index c3ea5eff52a..78a05a4a720 100644
--- a/reactos/subsystems/mvdm/ntvdm/int32.h
+++ b/reactos/subsystems/mvdm/ntvdm/int32.h
@@ -10,6 +10,10 @@
 #ifndef _INT32_H_
 #define _INT32_H_
 
+/* INCLUDES *******************************************************************/
+
+#include "cpu/callback.h"
+
 /* DEFINES ********************************************************************/
 
 /* 32-bit Interrupt Identifiers */
@@ -56,4 +60,6 @@ Int32Call(IN PCALLBACK16 Context,
 
 VOID InitializeInt32(VOID);
 
-#endif /* _INT32_H_ */
+#endif // _INT32_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/io.c b/reactos/subsystems/mvdm/ntvdm/io.c
index 02fa11228c1..4eb20c28c8b 100644
--- a/reactos/subsystems/mvdm/ntvdm/io.c
+++ b/reactos/subsystems/mvdm/ntvdm/io.c
@@ -7,11 +7,16 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "io.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _EMULATOR_IO_HANDLERS
diff --git a/reactos/subsystems/mvdm/ntvdm/memory.c b/reactos/subsystems/mvdm/ntvdm/memory.c
index 85283e79d56..3b53374afc2 100644
--- a/reactos/subsystems/mvdm/ntvdm/memory.c
+++ b/reactos/subsystems/mvdm/ntvdm/memory.c
@@ -6,11 +6,16 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "memory.h"
+
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _MEM_HOOK
diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.c b/reactos/subsystems/mvdm/ntvdm/ntvdm.c
index 49384c75a6d..7d9a825e293 100644
--- a/reactos/subsystems/mvdm/ntvdm/ntvdm.c
+++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.c
@@ -6,11 +6,20 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+
+#include "bios/bios.h"
+#include "cpu/cpu.h"
+
+#include "dos/dem.h"
+
 #include "resource.h"
 
 /* VARIABLES ******************************************************************/
diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.h b/reactos/subsystems/mvdm/ntvdm/ntvdm.h
index 74f87627a54..77b58fdd108 100644
--- a/reactos/subsystems/mvdm/ntvdm/ntvdm.h
+++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.h
@@ -45,58 +45,6 @@ DWORD WINAPI SetLastConsoleEventActive(VOID);
 /* PSEH for SEH Support */
 #include <pseh/pseh2.h>
 
-#include <reactos/buildno.h>
-#include <reactos/version.h>
-
-#include <fast486.h>
-#include <isvbop.h>
-
-#include "bios/bios32/bios32.h"
-#include "bios/bios32/dskbios32.h"
-#include "bios/bios32/kbdbios32.h"
-#include "bios/bios32/moubios32.h"
-#include "bios/bios32/vidbios32.h"
-#include "bios/vidbios.h"
-#include "bios/bios.h"
-#include "bios/kbdbios.h"
-#include "bios/umamgr.h"
-#include "cpu/callback.h"
-#include "bios/rom.h"
-#include "clock.h"
-#include "cpu/bop.h"
-#include "cpu/cpu.h"
-#include "dos/dem.h"
-#include "dos/mouse32.h"
-#include "dos/dos32krnl/country.h"
-#include "dos/dos32krnl/device.h"
-#include "dos/dos32krnl/dos.h"
-#include "dos/dos32krnl/dosfiles.h"
-#include "dos/dos32krnl/emsdrv.h"
-#include "dos/dos32krnl/handle.h"
-#include "dos/dos32krnl/himem.h"
-#include "dos/dos32krnl/process.h"
-#include "emulator.h"
-#include "hardware/cmos.h"
-#include "hardware/disk.h"
-#include "hardware/dma.h"
-#include "hardware/keyboard.h"
-#include "hardware/mouse.h"
-#include "hardware/pic.h"
-#include "hardware/pit.h"
-#include "hardware/ppi.h"
-#include "hardware/ps2.h"
-#include "hardware/sound/speaker.h"
-#include "hardware/video/svga.h"
-#include "bios/bios32/vbe.h"
-#include "int32.h"
-#include "bios/bios32/bios32p.h"
-#include "io.h"
-#include "utils.h"
-#include "vddsup.h"
-
-#include "memory.h"
-#include "dos/dos32krnl/memory.h"
-
 /*
  * Activate this line if you want to run NTVDM in standalone mode with:
  * ntvdm.exe <program>
@@ -158,4 +106,6 @@ VOID ConsoleReattach(HANDLE ConOutHandle);
 VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent);
 VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);
 
-#endif /* _NTVDM_H_ */
+#endif // _NTVDM_H_
+
+/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/utils.c b/reactos/subsystems/mvdm/ntvdm/utils.c
index 31700755377..d46a2841a31 100644
--- a/reactos/subsystems/mvdm/ntvdm/utils.c
+++ b/reactos/subsystems/mvdm/ntvdm/utils.c
@@ -6,11 +6,15 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+/* PRIVATE FUNCTIONS **********************************************************/
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 VOID
diff --git a/reactos/subsystems/mvdm/ntvdm/vddsup.c b/reactos/subsystems/mvdm/ntvdm/vddsup.c
index ac0248477c3..f6a6fa9afa5 100644
--- a/reactos/subsystems/mvdm/ntvdm/vddsup.c
+++ b/reactos/subsystems/mvdm/ntvdm/vddsup.c
@@ -6,11 +6,19 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
+/* INCLUDES *******************************************************************/
+
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
+#include "emulator.h"
+#include "vddsup.h"
+
+#include "cpu/bop.h"
+#include <isvbop.h>
+
 typedef VOID (WINAPI *VDD_PROC)(VOID);
 
 typedef struct _VDD_MODULE