diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index 8b96485f47f..7096448f90f 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -9,9 +9,8 @@
  *  Written by Barry Rodewald
  */
 
-#include "emu.h"
-#include "debugger.h"
 #include "8x300.h"
+#include "debugger.h"
 
 #define FETCHOP(a)         (m_direct->read_word(a))
 #define CYCLES(x)          do { m_icount -= (x); } while (0)
diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h
index dd236372e5d..c2eff97499b 100644
--- a/src/devices/cpu/8x300/8x300.h
+++ b/src/devices/cpu/8x300/8x300.h
@@ -10,6 +10,8 @@
 #ifndef _8X300_H_
 #define _8X300_H_
 
+#include "emu.h"
+
 // Register enumeration
 enum
 {
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index 04a194d6993..96dd03fa1a9 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#include "debugger.h"
 
 #include "upd765.h"
+#include "debugger.h"
 
 const device_type UPD765A = &device_creator<upd765a_device>;
 const device_type UPD765B = &device_creator<upd765b_device>;
diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp
index f91cf819e95..d3c87ba516c 100644
--- a/src/mame/machine/rmnimbus.cpp
+++ b/src/mame/machine/rmnimbus.cpp
@@ -61,11 +61,11 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512
 
 #include <functional>
 
+#include "includes/rmnimbus.h"
 #include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
 #include "imagedev/flopdrv.h"
-#include "includes/rmnimbus.h"