diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp
index c095ba3ee05..c2dfe37ce0a 100644
--- a/src/devices/sound/dac.cpp
+++ b/src/devices/sound/dac.cpp
@@ -12,8 +12,9 @@
 
 ***************************************************************************/
 
+#include "emu.h"
+
 #define DAC_GENERATOR_EPILOG(_dac_type, _dac_class, _dac_description, _dac_shortname) \
 DEFINE_DEVICE_TYPE(_dac_type, _dac_class, _dac_shortname, _dac_description)
 
-#include "emu.h"
 #include "dac.h"
diff --git a/src/devices/video/cgapal.cpp b/src/devices/video/cgapal.cpp
index 396c313c1ba..b726db23335 100644
--- a/src/devices/video/cgapal.cpp
+++ b/src/devices/video/cgapal.cpp
@@ -11,6 +11,7 @@
  *
  */
 
+#include "emu.h"
 #include "video/cgapal.h"
 
 const unsigned char cga_palette[16 * CGA_PALETTE_SETS][3] =
diff --git a/src/emu/attotime.cpp b/src/emu/attotime.cpp
index e756aa9653d..057a840454b 100644
--- a/src/emu/attotime.cpp
+++ b/src/emu/attotime.cpp
@@ -8,9 +8,7 @@
 
 ***************************************************************************/
 
-#include "emucore.h"
-#include "eminline.h"
-#include "attotime.h"
+#include "emu.h"
 
 
 //**************************************************************************
diff --git a/src/emu/debug/textbuf.cpp b/src/emu/debug/textbuf.cpp
index 279ce8dead6..32d86cbce32 100644
--- a/src/emu/debug/textbuf.cpp
+++ b/src/emu/debug/textbuf.cpp
@@ -8,7 +8,7 @@
 
 ***************************************************************************/
 
-#include "corealloc.h"
+#include "emu.h"
 #include "textbuf.h"
 
 
diff --git a/src/emu/emualloc.cpp b/src/emu/emualloc.cpp
index 3993121e9bc..c15f6db7bf4 100644
--- a/src/emu/emualloc.cpp
+++ b/src/emu/emualloc.cpp
@@ -8,7 +8,7 @@
 
 ***************************************************************************/
 
-#include "emucore.h"
+#include "emu.h"
 
 
 //**************************************************************************
diff --git a/src/emu/video/rgbgen.cpp b/src/emu/video/rgbgen.cpp
index 1882493b698..db4cd95de61 100644
--- a/src/emu/video/rgbgen.cpp
+++ b/src/emu/video/rgbgen.cpp
@@ -8,9 +8,11 @@
 
 ***************************************************************************/
 
+#include "emu.h"
+
+
 #if !(defined(__ALTIVEC__) || ((!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || defined(_MSC_VER)) && defined(PTR64)))
 
-#include "emu.h"
 #include "rgbgen.h"
 
 /***************************************************************************
diff --git a/src/emu/video/rgbsse.cpp b/src/emu/video/rgbsse.cpp
index 24c09fc68c3..719310ff144 100644
--- a/src/emu/video/rgbsse.cpp
+++ b/src/emu/video/rgbsse.cpp
@@ -10,9 +10,10 @@
 
 ***************************************************************************/
 
+#include "emu.h"
+
 #if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || defined(_MSC_VER)) && defined(PTR64)
 
-#include "emu.h"
 #include <emmintrin.h>
 #include "rgbsse.h"
 
diff --git a/src/emu/video/rgbvmx.cpp b/src/emu/video/rgbvmx.cpp
index 5673e82a7bf..6de183b66c2 100644
--- a/src/emu/video/rgbvmx.cpp
+++ b/src/emu/video/rgbvmx.cpp
@@ -8,9 +8,10 @@
 
 ***************************************************************************/
 
+#include "emu.h"
+
 #if defined(__ALTIVEC__)
 
-#include "emu.h"
 #include "rgbutil.h"
 
 /***************************************************************************