From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 3 Oct 2015 21:47:46 +0000 (+0000)
Subject: [NTVDM] Improve the PCH situation.
X-Git-Tag: ReactOS-0.4.0~612
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f24e24d07cc2fb636b591adb57577ad5a041d6ee

[NTVDM] Improve the PCH situation.

svn path=/trunk/; revision=69435
---

diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios.c b/reactos/subsystems/mvdm/ntvdm/bios/bios.c
index 9ee04e264d7..598be0b8568 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios.c
@@ -6,25 +6,11 @@
  * 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 8182a0779f1..060ec0ab2b4 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios.h
@@ -9,11 +9,6 @@
 #ifndef _BIOS_H_
 #define _BIOS_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "kbdbios.h"
-#include "vidbios.h"
-
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
@@ -165,6 +160,4 @@ BiosInitialize(IN LPCSTR BiosFileName,
 VOID
 BiosCleanup(VOID);
 
-#endif // _BIOS_H_
-
-/* EOF */
+#endif /* _BIOS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
index 436ac2122b3..556d47607d2 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
@@ -7,39 +7,11 @@
  *                  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;
@@ -165,7 +137,7 @@ static const BYTE PostCode[] =
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-static VOID BiosCharPrint(CHAR Character)
+static VOID Bios32CharPrint(CHAR Character)
 {
     /* Save AX and BX */
     USHORT AX = getAX();
@@ -534,7 +506,7 @@ static VOID WINAPI BiosMiscService(LPWORD Stack)
 
 static VOID WINAPI BiosRomBasic(LPWORD Stack)
 {
-    PrintMessageAnsi(BiosCharPrint, "FATAL: INT18: BOOT FAILURE.");
+    PrintMessageAnsi(Bios32CharPrint, "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 6030361cf28..2205b4200a3 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h
@@ -9,10 +9,6 @@
 #ifndef _BIOS32_H_
 #define _BIOS32_H_
 
-/* INCLUDES *******************************************************************/
-
-// #include <bios/bios.h>
-
 /* DEFINES ********************************************************************/
 
 enum
@@ -41,6 +37,4 @@ typedef struct
 BOOLEAN Bios32Initialize(VOID);
 VOID Bios32Cleanup(VOID);
 
-#endif // _BIOS32_H_
-
-/* EOF */
+#endif /* _BIOS32_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
index 28d1a45a13a..bc4e25f3239 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
@@ -9,12 +9,6 @@
 #ifndef _BIOS32P_H_
 #define _BIOS32P_H_
 
-/* INCLUDES *******************************************************************/
-
-#include <bios/bios.h>
-
-/**/ #include "int32.h" /**/
-
 /* DEFINES ********************************************************************/
 
 #define BIOS_PIC_MASTER_INT 0x08
@@ -42,6 +36,4 @@ do { \
 VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func);
 VOID PicIRQComplete(BYTE IntNum);
 
-#endif // _BIOS32P_H_
-
-/* EOF */
+#endif /* _BIOS32P_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
index 9bc83c08801..fa2864f44bd 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
@@ -6,26 +6,11 @@
  * 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/dskbios32.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h
index c777620519a..f05d34e6eec 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h
@@ -21,5 +21,3 @@ BOOLEAN DiskBios32Initialize(VOID);
 VOID DiskBios32Cleanup(VOID);
 
 #endif /* _DSKBIOS32_H_ */
-
-/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
index af4c57c288b..59217551726 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
@@ -6,22 +6,11 @@
  * 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/kbdbios32.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h
index a89125d55ca..1345645ff1c 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h
@@ -39,5 +39,3 @@
 VOID KbdBios32Post(VOID);
 
 #endif /* _KBDBIOS32_H_ */
-
-/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
index 559101e4667..8a927083e2c 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
@@ -9,23 +9,11 @@
  * 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/moubios32.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h
index 80b10abaf6d..67bc6dce788 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h
@@ -20,5 +20,3 @@ BOOLEAN MouseBiosInitialize(VOID);
 VOID MouseBios32Cleanup(VOID);
 
 #endif /* _MOUBIOS32_H_ */
-
-/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
index a7d656ce351..ca1c06fb6a8 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
@@ -6,20 +6,11 @@
  * 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 b5198e91c07..c658c137e75 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h
@@ -9,8 +9,6 @@
 #ifndef _VBE_H_
 #define _VBE_H_
 
-#include "hardware/video/svga.h"
-
 /* DEFINITIONS ****************************************************************/
 
 #define OEM_NAME     "Cirrus Logic GD-5434 VGA"
@@ -105,4 +103,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 f9405d484f1..faa6ed9ac53 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
@@ -8,21 +8,11 @@
  * 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/bios32/vidbios32.h b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h
index 3fc91a2c149..870922041e4 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h
@@ -21,5 +21,3 @@ BOOLEAN VidBios32Initialize(VOID);
 VOID VidBios32Cleanup(VOID);
 
 #endif /* _VIDBIOS32_H_ */
-
-/* EOF */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
index 504984a15de..ab90cdf3c2c 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
@@ -6,20 +6,11 @@
  * 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/kbdbios.h b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h
index 11acf914ee4..ec95f95ca2d 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h
@@ -20,6 +20,4 @@
 BOOLEAN KbdBiosInitialize(VOID);
 VOID KbdBiosCleanup(VOID);
 
-#endif // _KBDBIOS_H_
-
-/* EOF */
+#endif /* _KBDBIOS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/rom.c b/reactos/subsystems/mvdm/ntvdm/bios/rom.c
index 6fbf272d142..7bba14f9a41 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/rom.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/rom.c
@@ -6,20 +6,11 @@
  * 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/rom.h b/reactos/subsystems/mvdm/ntvdm/bios/rom.h
index b9d55dde0c4..f54e7a58ca8 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/rom.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/rom.h
@@ -43,6 +43,4 @@ LoadRom(IN  PCSTR  RomFileName,
 VOID
 SearchAndInitRoms(IN PCALLBACK16 Context);
 
-#endif // _ROM_H_
-
-/* EOF */
+#endif /* _ROM_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
index 06d0a17e1ed..d7f5fbeffe8 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
@@ -9,18 +9,11 @@
  *       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/umamgr.h b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h
index 0d2a3230d84..4385ac4eda1 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h
@@ -29,6 +29,4 @@ BOOLEAN UmaDescReallocate(IN USHORT UmbSegment, IN OUT PUSHORT Size);
 BOOLEAN UmaMgrInitialize(VOID);
 VOID UmaMgrCleanup(VOID);
 
-#endif // _UMAMGR_H_
-
-/* EOF */
+#endif /* _UMAMGR_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
index e4cdc370c8b..a42f587e2bf 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
+++ b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
@@ -7,32 +7,11 @@
  *                  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/bios/vidbios.h b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h
index a0740291ed0..eca14cd94a1 100644
--- a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h
+++ b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h
@@ -113,6 +113,4 @@ VOID VidBiosPost(VOID);
 BOOLEAN VidBiosInitialize(VOID);
 VOID VidBiosCleanup(VOID);
 
-#endif // _VIDBIOS_H_
-
-/* EOF */
+#endif /* _VIDBIOS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/clock.c b/reactos/subsystems/mvdm/ntvdm/clock.c
index 84d63915e90..495674ddbf3 100644
--- a/reactos/subsystems/mvdm/ntvdm/clock.c
+++ b/reactos/subsystems/mvdm/ntvdm/clock.c
@@ -7,23 +7,11 @@
  *                  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/clock.h b/reactos/subsystems/mvdm/ntvdm/clock.h
index b664a36d1fa..f5d04e5e989 100644
--- a/reactos/subsystems/mvdm/ntvdm/clock.h
+++ b/reactos/subsystems/mvdm/ntvdm/clock.h
@@ -50,6 +50,4 @@ ULONGLONG GetCycleSpeed(VOID);
 VOID ClockUpdate(VOID);
 BOOLEAN ClockInitialize(VOID);
 
-#endif // _CLOCK_H_
-
-/* EOF */
+#endif /* _CLOCK_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/bop.c b/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
index dc64f9b519c..8d165131fcf 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
@@ -7,16 +7,11 @@
  *                  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/bop.h b/reactos/subsystems/mvdm/ntvdm/cpu/bop.h
index 6c05eb0c5f6..292125cc208 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/bop.h
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/bop.h
@@ -23,6 +23,4 @@ typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack);
 VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler);
 VOID FASTCALL EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode);
 
-#endif // _BOP_H_
-
-/* EOF */
+#endif /* _BOP_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/callback.c b/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
index 00c89799897..9d5905fe3d4 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
@@ -15,20 +15,11 @@
 |   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/callback.h b/reactos/subsystems/mvdm/ntvdm/cpu/callback.h
index c0acf5dd60a..4c7570e713f 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/callback.h
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/callback.h
@@ -58,6 +58,4 @@ RegisterCallback16(IN  ULONG   FarPtr,
                    IN  SIZE_T  CallbackSize,
                    OUT PSIZE_T CodeSize OPTIONAL);
 
-#endif // _CALLBACK_H_
-
-/* EOF */
+#endif /* _CALLBACK_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
index 212f522d0a4..07d38c5aeae 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
@@ -6,34 +6,11 @@
  * 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 28cd635e96f..04ef5034a43 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h
@@ -9,10 +9,6 @@
 #ifndef _CPU_H_
 #define _CPU_H_
 
-/* INCLUDES *******************************************************************/
-
-#include <fast486.h>
-
 /* DEFINES ********************************************************************/
 
 /* FLAGS */
@@ -74,6 +70,4 @@ VOID EmulatorTerminate(VOID);
 BOOLEAN CpuInitialize(VOID);
 VOID CpuCleanup(VOID);
 
-#endif // _CPU_H_
-
-/* EOF */
+#endif /* _CPU_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/registers.c b/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
index 88c7183edc3..fd6bf3ad0e0 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
@@ -6,15 +6,11 @@
  * 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/cpu/registers.h b/reactos/subsystems/mvdm/ntvdm/cpu/registers.h
index 366d8879bbd..f00f882d24d 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/registers.h
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/registers.h
@@ -116,6 +116,4 @@ VOID   WINAPI setMSW(USHORT);
 
 #endif
 
-#endif // _REGISTERS_H_
-
-/* EOF */
+#endif /* _REGISTERS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h b/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h
index 541588b1800..707f8824d46 100644
--- a/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h
+++ b/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h
@@ -134,6 +134,4 @@ typedef struct _X86CONTEXT
 } X86CONTEXT;
 #include "poppack.h"
 
-#endif // __X86CONTEXT_H__
-
-/* EOF */
+#endif /* __X86CONTEXT_H__ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dem.c b/reactos/subsystems/mvdm/ntvdm/dos/dem.c
index 0ed51c292ba..0608f56ba23 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dem.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dem.c
@@ -10,30 +10,11 @@
  *                  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 befbe80dc61..56356a35f10 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dem.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dem.h
@@ -13,10 +13,6 @@
 #ifndef _DEM_H_
 #define _DEM_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "dos32krnl/dos.h"
-
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
@@ -101,6 +97,4 @@ demSetCurrentDirectoryGetDrive
     OUT PUCHAR DriveNumber
 );
 
-#endif // _DEM_H_
-
-/* EOF */
+#endif /* _DEM_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
index bf28310e784..e7ab8b0c8f9 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
@@ -6,23 +6,11 @@
  * 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 ae8d419ab84..8f0245190a5 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
@@ -7,20 +7,11 @@
  *                  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 334c04c20f4..a436b7343cd 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
@@ -9,18 +9,11 @@
  *                  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/country.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h
index 7d7cc129721..3241db909b9 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h
@@ -96,4 +96,4 @@ VOID DosToUpperStrZ(PSTR DestStr, PSTR SrcStr);
 
 BOOLEAN DosCountryInitialize(VOID);
 
-#endif
+#endif /* _COUNTRY_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
index 71fbdcef1aa..66cb64fb825 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
@@ -6,21 +6,11 @@
  * 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/device.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h
index 62409c65d56..93ae340c0f6 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h
@@ -208,6 +208,4 @@ VOID DeviceStrategyBop(VOID);
 VOID DeviceInterruptBop(VOID);
 DWORD DosLoadDriver(LPCSTR DriverFile);
 
-#endif // _DEVICE_H_
-
-/* EOF */
+#endif /* _DEVICE_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
index d5b01ce7fbf..77a4db126fb 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
@@ -7,34 +7,11 @@
  *                  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 18e50077d4a..bc335f9977c 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h
@@ -9,12 +9,6 @@
 #ifndef _DOS_H_
 #define _DOS_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "device.h"
-
-/**/ #include "int32.h" /**/
-
 /* DEFINES ********************************************************************/
 
 //
@@ -333,6 +327,4 @@ VOID DosEchoCharacter(CHAR Character);
  */
 BOOLEAN DosKRNLInitialize(VOID);
 
-#endif // _DOS_H_
-
-/* EOF */
+#endif /* _DOS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
index 1dda966210a..4c69c834695 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
@@ -7,24 +7,11 @@
  *                  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/dosfiles.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h
index 1afc34bde32..942030200aa 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h
@@ -6,6 +6,8 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+#pragma once
+
 /* DEFINES ********************************************************************/
 
 #define FILE_INFO_STDIN  (1 << 0)
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
index bc22ce8eb0f..67dd546cfa8 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
@@ -9,23 +9,11 @@
  *                  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/emsdrv.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h
index af6b1d56485..0d3f1f65416 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h
@@ -100,6 +100,4 @@ typedef struct _EMS_HARDWARE_INFO
 BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages);
 VOID EmsDrvCleanup(VOID);
 
-#endif // _EMSDRV_H_
-
-/* EOF */
+#endif /* _EMSDRV_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
index 45ca0bc7769..378fc84a9f8 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
@@ -6,22 +6,11 @@
  * 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/handle.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h
index e81796d5888..35377ee3ed9 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h
@@ -6,6 +6,8 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+#pragma once
+
 /* DEFINITIONS ****************************************************************/
 
 #define DEFAULT_JFT_SIZE 20
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
index 19216eda0cd..d6143b06f2c 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
@@ -44,21 +44,11 @@
  * 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/himem.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h
index 0976ce35556..ab2a7ba1b92 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h
@@ -65,6 +65,4 @@ BOOLEAN XmsGetDriverEntry(PDWORD Pointer);
 VOID XmsInitialize(VOID);
 VOID XmsCleanup(VOID);
 
-#endif // _HIMEM_H_
-
-/* EOF */
+#endif /* _HIMEM_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
index b7cf0a5b95f..99f8704e766 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
@@ -7,23 +7,11 @@
  *                  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/memory.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h
index c38ae76b407..91317383de1 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h
@@ -50,6 +50,4 @@ VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner);
 VOID DosInitializeUmb(VOID);
 VOID DosInitializeMemory(VOID);
 
-#endif // _DOS_MEMORY_H_
-
-/* EOF */
+#endif /* _DOS_MEMORY_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
index f15b24f1f0f..50e725dbd26 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
@@ -7,30 +7,11 @@
  *                  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/dos32krnl/process.h b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h
index fe653891cc1..c998b8acd0c 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h
@@ -6,6 +6,8 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+#pragma once
+
 /* DEFINITIONS ****************************************************************/
 
 #define DOS_CMDLINE_LENGTH   127
diff --git a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
index f704ed2d0c1..3f378c3cf7b 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
+++ b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
@@ -6,34 +6,11 @@
  * 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/dos/mouse32.h b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h
index e9fcbea1ed4..4e6654c407a 100644
--- a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h
+++ b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h
@@ -78,6 +78,4 @@ typedef struct _MOUSE_DRIVER_STATE
 BOOLEAN DosMouseInitialize(VOID);
 VOID DosMouseCleanup(VOID);
 
-#endif // _MOUSE32_H_
-
-/* EOF */
+#endif /* _MOUSE32_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/emulator.c b/reactos/subsystems/mvdm/ntvdm/emulator.c
index dd92213a698..75a4a7e1ab0 100644
--- a/reactos/subsystems/mvdm/ntvdm/emulator.c
+++ b/reactos/subsystems/mvdm/ntvdm/emulator.c
@@ -6,40 +6,11 @@
  * 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 deff274d4fa..e5abc9ea3ba 100644
--- a/reactos/subsystems/mvdm/ntvdm/emulator.h
+++ b/reactos/subsystems/mvdm/ntvdm/emulator.h
@@ -9,10 +9,6 @@
 #ifndef _EMULATOR_H_
 #define _EMULATOR_H_
 
-/* INCLUDES *******************************************************************/
-
-#include <fast486.h>
-
 /* DEFINES ********************************************************************/
 
 /* Basic Memory Management */
@@ -121,6 +117,4 @@ VOID EmulatorTerminate(VOID);
 BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput);
 VOID EmulatorCleanup(VOID);
 
-#endif // _EMULATOR_H_
-
-/* EOF */
+#endif /* _EMULATOR_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
index 8482553c08e..c7fff9f9bb3 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
@@ -6,20 +6,11 @@
  * 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/cmos.h b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h
index 3420f57d0ef..ec73c9b1c36 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h
@@ -151,6 +151,4 @@ DWORD RtcGetTicksPerSecond(VOID);
 VOID CmosInitialize(VOID);
 VOID CmosCleanup(VOID);
 
-#endif // _CMOS_H_
-
-/* EOF */
+#endif /* _CMOS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/disk.c b/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
index 0b230480248..135df9b9bdf 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
@@ -18,22 +18,11 @@
  *         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/disk.h b/reactos/subsystems/mvdm/ntvdm/hardware/disk.h
index 826e3f195d3..524d0991ea3 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/disk.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/disk.h
@@ -88,6 +88,4 @@ UnmountDisk(IN DISK_TYPE DiskType,
 BOOLEAN DiskCtrlInitialize(VOID);
 VOID DiskCtrlCleanup(VOID);
 
-#endif // _DISK_H_
-
-/* EOF */
+#endif /* _DISK_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/dma.c b/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
index c2816adcc6e..9e9b4346d47 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
@@ -7,19 +7,11 @@
  * 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/dma.h b/reactos/subsystems/mvdm/ntvdm/hardware/dma.h
index 7155d5b2883..4f4aa4c3444 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/dma.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/dma.h
@@ -59,6 +59,4 @@ DWORD DmaRequest(IN WORD      iChannel,
 
 VOID DmaInitialize(VOID);
 
-#endif // _DMA_H_
-
-/* EOF */
+#endif /* _DMA_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
index 6d18b9da897..a2230f5ce6a 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
@@ -6,16 +6,11 @@
  * 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/keyboard.h b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h
index 0bc5f611a0a..b185436b848 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h
@@ -22,4 +22,4 @@
 VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent);
 BOOLEAN KeyboardInit(BYTE PS2Connector);
 
-#endif // _KEYBOARD_H_
+#endif /* _KEYBOARD_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
index 624cdbba203..a8df154b2e3 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
@@ -6,19 +6,11 @@
  * 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/mouse.h b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h
index 91500b61299..e34a3915b2d 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h
@@ -66,4 +66,4 @@ VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent);
 VOID MouseGetDataFast(PCOORD CurrentPosition, PBYTE CurrentButtonState);
 BOOLEAN MouseInit(BYTE PS2Connector);
 
-#endif // _MOUSE_H_
+#endif /* _MOUSE_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/pic.c b/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
index 63ac9d60fe9..a17a93ff72b 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
@@ -7,18 +7,11 @@
  * 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/pic.h b/reactos/subsystems/mvdm/ntvdm/hardware/pic.h
index ed1b3f43791..8e114f2765d 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/pic.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/pic.h
@@ -37,6 +37,4 @@ BYTE PicGetInterrupt(VOID);
 
 VOID PicInitialize(VOID);
 
-#endif // _PIC_H_
-
-/* EOF */
+#endif /* _PIC_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/pit.c b/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
index 540ecec14a5..1a28f291d7c 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
@@ -8,20 +8,11 @@
  *                  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/pit.h b/reactos/subsystems/mvdm/ntvdm/hardware/pit.h
index d8799a1649e..80f1a30da52 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/pit.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/pit.h
@@ -77,6 +77,4 @@ WORD PitGetReloadValue(BYTE Channel);
 
 VOID PitInitialize(VOID);
 
-#endif // _PIT_H_
-
-/* EOF */
+#endif /* _PIT_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
index fbab101931a..e3fa3d7b873 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
@@ -11,21 +11,11 @@
  *        - 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/ppi.h b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h
index 4ec550dde0c..68810e58c46 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h
@@ -21,6 +21,4 @@ extern BYTE Port61hState;
 
 VOID PpiInitialize(VOID);
 
-#endif // _PPI_H_
-
-/* EOF */
+#endif /* _PPI_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
index 4222cc5ed8a..74312c2b089 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
@@ -11,21 +11,11 @@
  *                  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/ps2.h b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h
index d2a61ab7478..2033136a284 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h
@@ -57,6 +57,4 @@ BOOLEAN PS2PortQueueRead(BYTE PS2Port);
 BOOLEAN PS2Initialize(VOID);
 VOID PS2Cleanup(VOID);
 
-#endif // _PS2_H_
-
-/* EOF */
+#endif /* _PS2_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
index f99918b0a0d..ac035fc3065 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
@@ -6,16 +6,11 @@
  * 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/sound/speaker.h b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h
index c30555884b8..e5721ec3522 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h
@@ -16,6 +16,4 @@ VOID SpeakerChange(UCHAR Port61hValue);
 VOID SpeakerInitialize(VOID);
 VOID SpeakerCleanup(VOID);
 
-#endif // _SPEAKER_H_
-
-/* EOF */
+#endif /* _SPEAKER_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
index f5b06ca7988..712edd22ea7 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
@@ -6,21 +6,11 @@
  * 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/hardware/video/svga.h b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h
index b4e16d0cae6..1135742bad5 100644
--- a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h
+++ b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h
@@ -385,6 +385,4 @@ BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical);
 BOOLEAN VgaInitialize(HANDLE TextHandle);
 VOID VgaCleanup(VOID);
 
-#endif // _SVGA_H_
-
-/* EOF */
+#endif /* _SVGA_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/int32.c b/reactos/subsystems/mvdm/ntvdm/int32.c
index 0081765a669..3ba666d3b94 100644
--- a/reactos/subsystems/mvdm/ntvdm/int32.c
+++ b/reactos/subsystems/mvdm/ntvdm/int32.c
@@ -7,19 +7,11 @@
  *                  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 78a05a4a720..c3ea5eff52a 100644
--- a/reactos/subsystems/mvdm/ntvdm/int32.h
+++ b/reactos/subsystems/mvdm/ntvdm/int32.h
@@ -10,10 +10,6 @@
 #ifndef _INT32_H_
 #define _INT32_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "cpu/callback.h"
-
 /* DEFINES ********************************************************************/
 
 /* 32-bit Interrupt Identifiers */
@@ -60,6 +56,4 @@ Int32Call(IN PCALLBACK16 Context,
 
 VOID InitializeInt32(VOID);
 
-#endif // _INT32_H_
-
-/* EOF */
+#endif /* _INT32_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/io.c b/reactos/subsystems/mvdm/ntvdm/io.c
index 4eb20c28c8b..02fa11228c1 100644
--- a/reactos/subsystems/mvdm/ntvdm/io.c
+++ b/reactos/subsystems/mvdm/ntvdm/io.c
@@ -7,16 +7,11 @@
  *                  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/io.h b/reactos/subsystems/mvdm/ntvdm/io.h
index edd91000cde..bf4653ea1e3 100644
--- a/reactos/subsystems/mvdm/ntvdm/io.h
+++ b/reactos/subsystems/mvdm/ntvdm/io.h
@@ -103,6 +103,4 @@ VOID FASTCALL EmulatorWriteIo
     UCHAR DataSize
 );
 
-#endif // _IO_H_
-
-/* EOF */
+#endif /* _IO_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/memory.c b/reactos/subsystems/mvdm/ntvdm/memory.c
index 3b53374afc2..85283e79d56 100644
--- a/reactos/subsystems/mvdm/ntvdm/memory.c
+++ b/reactos/subsystems/mvdm/ntvdm/memory.c
@@ -6,16 +6,11 @@
  * 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/memory.h b/reactos/subsystems/mvdm/ntvdm/memory.h
index 0fa3ee7dd35..3dd9698ecbe 100644
--- a/reactos/subsystems/mvdm/ntvdm/memory.h
+++ b/reactos/subsystems/mvdm/ntvdm/memory.h
@@ -92,6 +92,4 @@ MemQueryMemoryZone
     PBOOLEAN Hooked
 );
 
-#endif // _MEMORY_H_
-
-/* EOF */
+#endif /* _MEMORY_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.c b/reactos/subsystems/mvdm/ntvdm/ntvdm.c
index 7d9a825e293..49384c75a6d 100644
--- a/reactos/subsystems/mvdm/ntvdm/ntvdm.c
+++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.c
@@ -6,20 +6,11 @@
  * 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 77b58fdd108..74f87627a54 100644
--- a/reactos/subsystems/mvdm/ntvdm/ntvdm.h
+++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.h
@@ -45,6 +45,58 @@ 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>
@@ -106,6 +158,4 @@ VOID ConsoleReattach(HANDLE ConOutHandle);
 VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent);
 VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);
 
-#endif // _NTVDM_H_
-
-/* EOF */
+#endif /* _NTVDM_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/utils.c b/reactos/subsystems/mvdm/ntvdm/utils.c
index d46a2841a31..31700755377 100644
--- a/reactos/subsystems/mvdm/ntvdm/utils.c
+++ b/reactos/subsystems/mvdm/ntvdm/utils.c
@@ -6,15 +6,11 @@
  * 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/utils.h b/reactos/subsystems/mvdm/ntvdm/utils.h
index bb53b503307..7b3887dc924 100644
--- a/reactos/subsystems/mvdm/ntvdm/utils.h
+++ b/reactos/subsystems/mvdm/ntvdm/utils.h
@@ -24,6 +24,4 @@ FileLoadByHandle(IN  HANDLE FileHandle,
                  IN  ULONG  FileSize,
                  OUT PULONG BytesRead);
 
-#endif // _UTILS_H_
-
-/* EOF */
+#endif /* _UTILS_H_ */
diff --git a/reactos/subsystems/mvdm/ntvdm/vddsup.c b/reactos/subsystems/mvdm/ntvdm/vddsup.c
index f6a6fa9afa5..ac0248477c3 100644
--- a/reactos/subsystems/mvdm/ntvdm/vddsup.c
+++ b/reactos/subsystems/mvdm/ntvdm/vddsup.c
@@ -6,19 +6,11 @@
  * 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
diff --git a/reactos/subsystems/mvdm/ntvdm/vddsup.h b/reactos/subsystems/mvdm/ntvdm/vddsup.h
index fa0d990a365..e8023dda04c 100644
--- a/reactos/subsystems/mvdm/ntvdm/vddsup.h
+++ b/reactos/subsystems/mvdm/ntvdm/vddsup.h
@@ -18,6 +18,4 @@ VOID VDDResumeUserHook(VOID);
 
 VOID VDDSupInitialize(VOID);
 
-#endif // _VDDSUP_H_
-
-/* EOF */
+#endif /* _VDDSUP_H_ */