diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index 23ebba2e158..6ae9c53b245 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -382,57 +382,6 @@ Keyboard TX commands:
 ****************************************************************************************************/
 
 #include "emu.h"
-
-#include "cpu/i386/i386.h"
-#include "cpu/i86/i286.h"
-#include "cpu/i86/i86.h"
-#include "cpu/nec/nec.h"
-
-#include "machine/am9517a.h"
-#include "machine/bankdev.h"
-#include "machine/buffer.h"
-#include "machine/i8251.h"
-#include "machine/i8255.h"
-#include "machine/latch.h"
-#include "machine/pic8259.h"
-#include "machine/pit8253.h"
-#include "machine/ram.h"
-#include "machine/upd1990a.h"
-#include "machine/upd765.h"
-
-#include "bus/scsi/pc9801_sasi.h"
-#include "bus/scsi/scsi.h"
-#include "bus/scsi/scsihd.h"
-
-#include "sound/2608intf.h"
-#include "sound/beep.h"
-#include "sound/spkrdev.h"
-
-#include "video/upd7220.h"
-
-#include "bus/cbus/pc9801_26.h"
-#include "bus/cbus/pc9801_86.h"
-#include "bus/cbus/pc9801_118.h"
-#include "bus/cbus/mpu_pc98.h"
-#include "bus/cbus/pc9801_cbus.h"
-#include "machine/pc9801_kbd.h"
-#include "machine/pc9801_cd.h"
-
-#include "machine/idectrl.h"
-#include "machine/idehd.h"
-
-#include "debugger.h"
-#include "screen.h"
-#include "softlist.h"
-#include "speaker.h"
-
-#include "formats/pc98_dsk.h"
-#include "formats/pc98fdi_dsk.h"
-#include "formats/fdd_dsk.h"
-#include "formats/dcp_dsk.h"
-#include "formats/dip_dsk.h"
-#include "formats/nfd_dsk.h"
-
 #include "includes/pc9801.h"
 
 
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index 6ae3af993b4..f8d22e6eb57 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -6,6 +6,57 @@
 #ifndef __PC9801__
 #define __PC9801__
 
+#include "cpu/i386/i386.h"
+#include "cpu/i86/i286.h"
+#include "cpu/i86/i86.h"
+#include "cpu/nec/nec.h"
+
+#include "machine/am9517a.h"
+#include "machine/bankdev.h"
+#include "machine/buffer.h"
+#include "machine/i8251.h"
+#include "machine/i8255.h"
+#include "machine/latch.h"
+#include "machine/pic8259.h"
+#include "machine/pit8253.h"
+#include "machine/ram.h"
+#include "machine/upd1990a.h"
+#include "machine/upd765.h"
+
+#include "bus/scsi/pc9801_sasi.h"
+#include "bus/scsi/scsi.h"
+#include "bus/scsi/scsihd.h"
+
+#include "sound/2608intf.h"
+#include "sound/beep.h"
+#include "sound/spkrdev.h"
+
+#include "video/upd7220.h"
+
+#include "bus/cbus/pc9801_26.h"
+#include "bus/cbus/pc9801_86.h"
+#include "bus/cbus/pc9801_118.h"
+#include "bus/cbus/mpu_pc98.h"
+#include "bus/cbus/pc9801_cbus.h"
+#include "machine/pc9801_kbd.h"
+#include "machine/pc9801_cd.h"
+
+#include "machine/idectrl.h"
+#include "machine/idehd.h"
+
+#include "debugger.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/pc98_dsk.h"
+#include "formats/pc98fdi_dsk.h"
+#include "formats/fdd_dsk.h"
+#include "formats/dcp_dsk.h"
+#include "formats/dip_dsk.h"
+#include "formats/nfd_dsk.h"
+
+
 #define UPD1990A_TAG "upd1990a"
 #define UPD8251_TAG  "upd8251"
 #define SASIBUS_TAG  "sasi"