Move some includes around to fix compile errors on OSX; if this breaks any other environments then feel free to revert this. (nw)

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

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)

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"
 

src/lib/formats/d88_dsk.c

@@ -27,6 +27,7 @@
  *
  */
 
+#include "emu.h"
 #include "flopimg.h"
 #include "imageutl.h"
 

src/lib/formats/dim_dsk.c

@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "dim_dsk.h"
 #include "basicdsk.h"
 

src/lib/formats/dsk_dsk.c

@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "imageutl.h"
 #include "flopimg.h"
 

src/lib/formats/imd_dsk.c

@@ -7,6 +7,7 @@
 *********************************************************************/
 
 #include <string.h>
+#include "emu.h"
 #include "flopimg.h"
 
 struct imddsk_tag

src/lib/formats/m20_dsk.c

@@ -14,6 +14,7 @@
 
 #include <string.h>
 
+#include "emu.h"
 #include "m20_dsk.h"
 #include "basicdsk.h"
 

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

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 )
 

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"

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"