diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index b078f83b971..cc064ee3ddc 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -21,6 +21,8 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+#include <sstream>
+
 // some cleanups for Solaris for things defined in stdlib.h
 #ifdef SDLMAME_SOLARIS
 #undef si_status
diff --git a/src/lib/formats/coco_cas.c b/src/lib/formats/coco_cas.c
index 34078a9e8a0..880549c96ce 100644
--- a/src/lib/formats/coco_cas.c
+++ b/src/lib/formats/coco_cas.c
@@ -31,8 +31,8 @@
 
 **************************************************************************/
 
-#include "coco_cas.h"
 #include "emu.h"
+#include "coco_cas.h"
 
 #define COCO_WAVESAMPLES_HEADER     (1.0)
 #define COCO_WAVESAMPLES_TRAILER    (1.0)
diff --git a/src/lib/formats/cpis_dsk.c b/src/lib/formats/cpis_dsk.c
index e1ab029e8d2..9ad24d1d236 100644
--- a/src/lib/formats/cpis_dsk.c
+++ b/src/lib/formats/cpis_dsk.c
@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "formats/cpis_dsk.h"
 #include "formats/basicdsk.h"
 
diff --git a/src/lib/formats/d88_dsk.c b/src/lib/formats/d88_dsk.c
index 1df91cc94c9..0d41d49db5e 100644
--- a/src/lib/formats/d88_dsk.c
+++ b/src/lib/formats/d88_dsk.c
@@ -27,6 +27,7 @@
  *
  */
 
+#include "emu.h"
 #include "flopimg.h"
 #include "imageutl.h"
 
diff --git a/src/lib/formats/dim_dsk.c b/src/lib/formats/dim_dsk.c
index 39c1f4c04f5..8287647483e 100644
--- a/src/lib/formats/dim_dsk.c
+++ b/src/lib/formats/dim_dsk.c
@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "dim_dsk.h"
 #include "basicdsk.h"
 
diff --git a/src/lib/formats/dsk_dsk.c b/src/lib/formats/dsk_dsk.c
index d74c7b7e3d7..93ae590e846 100644
--- a/src/lib/formats/dsk_dsk.c
+++ b/src/lib/formats/dsk_dsk.c
@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "imageutl.h"
 #include "flopimg.h"
 
diff --git a/src/lib/formats/imd_dsk.c b/src/lib/formats/imd_dsk.c
index 317c4620831..ef5478f638f 100644
--- a/src/lib/formats/imd_dsk.c
+++ b/src/lib/formats/imd_dsk.c
@@ -7,6 +7,7 @@
 *********************************************************************/
 
 #include <string.h>
+#include "emu.h"
 #include "flopimg.h"
 
 struct imddsk_tag
diff --git a/src/lib/formats/m20_dsk.c b/src/lib/formats/m20_dsk.c
index c9b496bec79..0371f595d63 100644
--- a/src/lib/formats/m20_dsk.c
+++ b/src/lib/formats/m20_dsk.c
@@ -14,6 +14,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "m20_dsk.h"
 #include "basicdsk.h"
 
diff --git a/src/lib/formats/pasti_dsk.c b/src/lib/formats/pasti_dsk.c
index c1c3e164ab7..e78f816b8df 100644
--- a/src/lib/formats/pasti_dsk.c
+++ b/src/lib/formats/pasti_dsk.c
@@ -1,5 +1,5 @@
-#include "pasti_dsk.h"
 #include "emu.h"
+#include "pasti_dsk.h"
 
 // Pasti format supported using the documentation at
 // http://www.sarnau.info/atari:pasti_file_format
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 5c128cdd2a6..faf12ce6dc6 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -342,7 +342,6 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet)
 
   */
 
-#include "cdrom.h"
 #include "cpu/psx/psx.h"
 #include "machine/adc083x.h"
 #include "machine/ataintf.h"
@@ -361,6 +360,7 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet)
 #include "sound/spu.h"
 #include "sound/cdda.h"
 #include "video/psx.h"
+#include "cdrom.h"
 
 #define VERBOSE_LEVEL ( 0 )
 
diff --git a/src/osd/modules/debugger/debugosx.m b/src/osd/modules/debugger/debugosx.m
index 8b8cfa6d47a..196cc94bc18 100644
--- a/src/osd/modules/debugger/debugosx.m
+++ b/src/osd/modules/debugger/debugosx.m
@@ -22,12 +22,15 @@
 //  * Scroll views with content narrower than clipping area are flaky under Tiger - nothing I can do about this
 
 
+// Workaround for Nil being re=defined in luabridge
+#include "emu.h"
+
 // standard Cocoa headers
 #include <AvailabilityMacros.h>
 #import <Cocoa/Cocoa.h>
 
 // MAME headers
-#include "emu.h"
+//#include "emu.h"
 #include "debug/debugvw.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
diff --git a/src/tools/nltool.c b/src/tools/nltool.c
index 779094feb05..161abc7cb21 100644
--- a/src/tools/nltool.c
+++ b/src/tools/nltool.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <sstream>
 #include "astring.h"
 #include "corefile.h"
 #include "corestr.h"