Removed the global "includes" include and instead specify the "includes" path in all #include occurences. [Oliver Stoneberg]

---------- Forwarded message ----------
From: Oliver Stöneberg <oliverst@online.de>
Date: Sat, Dec 12, 2009 at 3:27 PM
Subject: includes cleanup
To: submit@mamedev.org


This patch removes the global "includes" include and explcitly
specifies the "includes" path in all #include occurances.

makefile

@@ -365,7 +365,6 @@ endif
 # add core include paths
 CCOMFLAGS += \
 	-I$(SRC)/$(TARGET) \
-	-I$(SRC)/$(TARGET)/includes \
 	-I$(OBJ)/$(TARGET)/layout \
 	-I$(SRC)/emu \
 	-I$(OBJ)/emu \

src/mame/audio/atarifb.c

@@ -5,7 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
-#include "atarifb.h"
+#include "includes/atarifb.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/avalnche.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "avalnche.h"
+#include "includes/avalnche.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/aztarac.c

@@ -6,7 +6,7 @@
 
 #include "driver.h"
 #include "cpu/z80/z80.h"
-#include "aztarac.h"
+#include "includes/aztarac.h"
 
 static int sound_status;
 

src/mame/audio/bsktball.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "bsktball.h"
+#include "includes/bsktball.h"
 #include "sound/discrete.h"
 
 /***************************************************************************

src/mame/audio/bzone.c

@@ -20,7 +20,7 @@ D0  explosion enable        gates a noise generator
 #include <math.h>
 #include "driver.h"
 #include "streams.h"
-#include "bzone.h"
+#include "includes/bzone.h"
 
 #include "sound/discrete.h"
 #include "sound/pokey.h"

src/mame/audio/canyon.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "canyon.h"
+#include "includes/canyon.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/cchasm.c

@@ -8,7 +8,7 @@
 #include "streams.h"
 #include "cpu/z80/z80.h"
 #include "machine/z80ctc.h"
-#include "cchasm.h"
+#include "includes/cchasm.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 

src/mame/audio/cinemat.c

@@ -21,7 +21,7 @@
 #include "cpu/ccpu/ccpu.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/z80ctc.h"
-#include "cinemat.h"
+#include "includes/cinemat.h"
 #include "sound/samples.h"
 #include "sound/ay8910.h"
 

src/mame/audio/circus.c

@@ -1,6 +1,6 @@
 #include "driver.h"
 #include "sound/samples.h"
-#include "circus.h"
+#include "includes/circus.h"
 
 static const char *const circus_sample_names[] =
 {

src/mame/audio/crbaloon.c

@@ -7,7 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
-#include "crbaloon.h"
+#include "includes/crbaloon.h"
 #include "sound/sn76477.h"
 #include "sound/discrete.h"
 

src/mame/audio/dragrace.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "dragrace.h"
+#include "includes/dragrace.h"
 #include "sound/discrete.h"
 
 /************************************************************************/

src/mame/audio/exidy.c

@@ -13,7 +13,7 @@
 #include "machine/6532riot.h"
 #include "sound/hc55516.h"
 #include "sound/tms5220.h"
-#include "exidy.h"
+#include "includes/exidy.h"
 
 
 

src/mame/audio/exidy440.c

@@ -10,7 +10,7 @@
 #include "driver.h"
 #include "cpu/m6809/m6809.h"
 #include "streams.h"
-#include "exidy440.h"
+#include "includes/exidy440.h"
 
 
 #define	SOUND_LOG		0

src/mame/audio/firetrk.c

@@ -5,7 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
-#include "firetrk.h"
+#include "includes/firetrk.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/galaga.c

@@ -6,7 +6,7 @@
 #include "driver.h"
 #include "namco52.h"
 #include "namco54.h"
-#include "galaga.h"
+#include "includes/galaga.h"
 
 
 /*************************************

src/mame/audio/grchamp.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "grchamp.h"
+#include "includes/grchamp.h"
 
 
 /************************************************************************/

src/mame/audio/gridlee.c

@@ -6,7 +6,7 @@
 
 #include "driver.h"
 #include "streams.h"
-#include "gridlee.h"
+#include "includes/gridlee.h"
 #include "sound/samples.h"
 
 

src/mame/audio/harddriv.c

@@ -8,7 +8,7 @@
 #include "cpu/tms32010/tms32010.h"
 #include "sound/dac.h"
 #include "machine/atarigen.h"
-#include "harddriv.h"
+#include "includes/harddriv.h"
 
 
 #define BIO_FREQUENCY		(1000000 / 50)

src/mame/audio/hitme.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "hitme.h"
+#include "includes/hitme.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/jedi.c

@@ -10,7 +10,7 @@
 #include "cpu/m6502/m6502.h"
 #include "sound/tms5220.h"
 #include "sound/pokey.h"
-#include "jedi.h"
+#include "includes/jedi.h"
 
 
 

src/mame/audio/leland.c

@@ -81,7 +81,7 @@
 #include "streams.h"
 #include "cpu/i86/i86.h"
 #include "cpu/z80/z80.h"
-#include "leland.h"
+#include "includes/leland.h"
 #include "sound/2151intf.h"
 
 

src/mame/audio/llander.c

@@ -5,7 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
-#include "asteroid.h"
+#include "includes/asteroid.h"
 #include "sound/discrete.h"
 
 /************************************************************************/

src/mame/audio/m79amb.c

@@ -4,7 +4,7 @@
  ************************************************************************/
 
 #include "driver.h"
-#include "m79amb.h"
+#include "includes/m79amb.h"
 #include "sound/discrete.h"
 
 #define	TIME_OF_9602(r, c)				(0.34 * (r) * (c) * (1.0 + 1.0 / (r)))

src/mame/audio/madalien.c

@@ -4,7 +4,7 @@
  ************************************************************************/
 
 #include "driver.h"
-#include "madalien.h"
+#include "includes/madalien.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/meadows.c

@@ -8,7 +8,7 @@
 
 #include "driver.h"
 #include "cpu/s2650/s2650.h"
-#include "meadows.h"
+#include "includes/meadows.h"
 #include "sound/samples.h"
 #include "sound/dac.h"
 

src/mame/audio/nitedrvr.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "nitedrvr.h"
+#include "includes/nitedrvr.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/norautp.c

@@ -4,7 +4,7 @@
  ************************************************************************/
 
 #include "driver.h"
-#include "norautp.h"
+#include "includes/norautp.h"
 
 
 /* Discrete Sound Input Nodes */

src/mame/audio/orbit.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "orbit.h"
+#include "includes/orbit.h"
 #include "sound/discrete.h"
 
 /*************************************

src/mame/audio/phoenix.c

@@ -11,7 +11,7 @@
 #include "driver.h"
 #include "streams.h"
 #include "sound/tms36xx.h"
-#include "phoenix.h"
+#include "includes/phoenix.h"
 
 /****************************************************************************
  * 4006

src/mame/audio/polepos.c

@@ -8,7 +8,7 @@
 #include "machine/rescap.h"
 #include "namco52.h"
 #include "namco54.h"
-#include "polepos.h"
+#include "includes/polepos.h"
 
 static int sample_msb = 0;
 static int sample_lsb = 0;

src/mame/audio/poolshrk.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "poolshrk.h"
+#include "includes/poolshrk.h"
 #include "sound/discrete.h"
 
 /************************************************************************/

src/mame/audio/qix.c

@@ -7,7 +7,7 @@
 #include "driver.h"
 #include "cpu/m6800/m6800.h"
 #include "cpu/m6809/m6809.h"
-#include "qix.h"
+#include "includes/qix.h"
 #include "sound/sn76496.h"
 #include "sound/discrete.h"
 

src/mame/audio/redalert.c

@@ -15,7 +15,7 @@
 #include "machine/6821pia.h"
 #include "sound/ay8910.h"
 #include "sound/hc55516.h"
-#include "redalert.h"
+#include "includes/redalert.h"
 
 
 

src/mame/audio/redbaron.c

@@ -17,7 +17,7 @@
 #include <math.h>
 #include "driver.h"
 #include "streams.h"
-#include "bzone.h"
+#include "includes/bzone.h"
 #include "sound/pokey.h"
 
 #define OUTPUT_RATE		(48000)

src/mame/audio/segag80r.c

@@ -10,7 +10,7 @@
 #include "driver.h"
 #include "streams.h"
 #include "cpu/mcs48/mcs48.h"
-#include "segag80r.h"
+#include "includes/segag80r.h"
 #include "machine/8255ppi.h"
 #include "machine/i8243.h"
 #include "sound/samples.h"

src/mame/audio/segag80v.c

@@ -5,7 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
-#include "segag80v.h"
+#include "includes/segag80v.h"
 #include "sound/samples.h"
 
 /* History:

src/mame/audio/segasnd.c

@@ -11,7 +11,7 @@
 
 #include "driver.h"
 #include "streams.h"
-#include "segag80v.h"
+#include "includes/segag80v.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/sp0250.h"
 #include "segasnd.h"

src/mame/audio/skydiver.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "skydiver.h"
+#include "includes/skydiver.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/skyraid.c

@@ -4,7 +4,7 @@
  ************************************************************************/
 
 #include "driver.h"
-#include "skyraid.h"
+#include "includes/skyraid.h"
 
 
 /* Discrete Sound Input Nodes */

src/mame/audio/snk6502.c

@@ -14,7 +14,7 @@
 #include "streams.h"
 #include "sound/sn76477.h"
 #include "sound/samples.h"
-#include "snk6502.h"
+#include "includes/snk6502.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/sprint2.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "sprint2.h"
+#include "includes/sprint2.h"
 
 
 /************************************************************************/

src/mame/audio/sprint8.c

@@ -4,7 +4,7 @@
  ************************************************************************/
 
 #include "driver.h"
-#include "sprint8.h"
+#include "includes/sprint8.h"
 
 
 /* Discrete Sound Input Nodes */

src/mame/audio/starshp1.c

@@ -4,7 +4,7 @@
  ************************************************************************/
 
 #include "driver.h"
-#include "starshp1.h"
+#include "includes/starshp1.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/subs.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "subs.h"
+#include "includes/subs.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/tank8.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "tank8.h"
+#include "includes/tank8.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/targ.c

@@ -14,7 +14,7 @@
 #include "driver.h"
 #include "sound/samples.h"
 #include "sound/dac.h"
-#include "targ.h"
+#include "includes/targ.h"
 
 
 

src/mame/audio/triplhnt.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "triplhnt.h"
+#include "includes/triplhnt.h"
 #include "sound/discrete.h"
 
 

src/mame/audio/turbo.c

@@ -5,7 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
-#include "turbo.h"
+#include "includes/turbo.h"
 #include "sound/samples.h"
 
 

src/mame/audio/vicdual.c

@@ -5,7 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
-#include "vicdual.h"
+#include "includes/vicdual.h"
 #include "sound/discrete.h"
 #include "sound/samples.h"
 

src/mame/audio/videopin.c

@@ -4,7 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
-#include "videopin.h"
+#include "includes/videopin.h"
 #include "sound/discrete.h"
 
 

src/mame/drivers/1942.c

@@ -67,7 +67,7 @@ correctly.
 #include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
-#include "1942.h"
+#include "includes/1942.h"
 
 
 static WRITE8_HANDLER( c1942_bankswitch_w )

src/mame/drivers/1943.c

@@ -31,7 +31,7 @@
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
-#include "1943.h"
+#include "includes/1943.h"
 
 
 /* Read/Write Handlers */

src/mame/drivers/20pacgal.c

@@ -40,7 +40,7 @@
 #include "machine/eepromdev.h"
 #include "sound/namco.h"
 #include "sound/dac.h"
-#include "20pacgal.h"
+#include "includes/20pacgal.h"
 
 
 /*************************************

src/mame/drivers/actfancr.c

@@ -28,7 +28,7 @@
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
 #include "sound/okim6295.h"
-#include "actfancr.h"
+#include "includes/actfancr.h"
 
 
 /******************************************************************************/

src/mame/drivers/aeroboto.c

@@ -25,7 +25,7 @@ Revisions:
 #include "driver.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
-#include "aeroboto.h"
+#include "includes/aeroboto.h"
 
 
 static READ8_HANDLER( aeroboto_201_r )

src/mame/drivers/ambush.c

@@ -36,7 +36,7 @@
 #include "driver.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
-#include "ambush.h"
+#include "includes/ambush.h"
 
 
 /*************************************

src/mame/drivers/angelkds.c

@@ -130,7 +130,7 @@ Dumped by Chackn
 #include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
 #include "sound/2203intf.h"
-#include "angelkds.h"
+#include "includes/angelkds.h"
 
 static READ8_HANDLER( angelkds_main_sound_r );
 static WRITE8_HANDLER( angelkds_main_sound_w );

src/mame/drivers/appoooh.c

@@ -163,7 +163,7 @@ Language
 
 #include "driver.h"
 #include "cpu/z80/z80.h"
-#include "appoooh.h"
+#include "includes/appoooh.h"
 #include "machine/segacrpt.h"		// needed for robowres_decode
 #include "sound/msm5205.h"
 #include "sound/sn76496.h"

src/mame/drivers/arabian.c

@@ -68,7 +68,7 @@
 
 #include "driver.h"
 #include "cpu/z80/z80.h"
-#include "arabian.h"
+#include "includes/arabian.h"
 #include "sound/ay8910.h"
 
 /* constants */

src/mame/drivers/arcadecl.c

@@ -68,7 +68,7 @@
 
 #include "driver.h"
 #include "cpu/m68000/m68000.h"
-#include "arcadecl.h"
+#include "includes/arcadecl.h"
 #include "sound/okim6295.h"
 
 

src/mame/drivers/arkanoid.c

@@ -505,7 +505,7 @@ DIP locations verified for:
 
 #include "driver.h"
 #include "cpu/z80/z80.h"
-#include "arkanoid.h"
+#include "includes/arkanoid.h"
 #include "sound/ay8910.h"
 #include "cpu/m6805/m6805.h"
 

src/mame/drivers/artmagic.c

@@ -25,7 +25,7 @@
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms34010/tms34010.h"
 #include "video/tlc34076.h"
-#include "artmagic.h"
+#include "includes/artmagic.h"
 #include "sound/okim6295.h"
 
 

src/mame/drivers/ashnojoe.c

@@ -77,7 +77,7 @@ Coin B is not used
 #include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
-#include "ashnojoe.h"
+#include "includes/ashnojoe.h"
 
 static READ16_HANDLER(fake_4a00a_r)
 {

src/mame/drivers/asteroid.c

@@ -189,7 +189,7 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a
 #include "video/vector.h"
 #include "video/avgdvg.h"
 #include "machine/atari_vg.h"
-#include "asteroid.h"
+#include "includes/asteroid.h"
 #include "sound/discrete.h"
 #include "sound/pokey.h"
 

src/mame/drivers/astrof.c

@@ -58,7 +58,7 @@
 
 #include "driver.h"
 #include "cpu/m6502/m6502.h"
-#include "astrof.h"
+#include "includes/astrof.h"
 
 
 #define MASTER_CLOCK  		(XTAL_10_595MHz)

src/mame/drivers/asuka.c

@@ -215,7 +215,7 @@ DIP locations verified for:
 #include "driver.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
-#include "taitoipt.h"
+#include "includes/taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
 #include "sound/2610intf.h"

src/mame/drivers/atarifb.c

@@ -105,7 +105,7 @@
 #include "driver.h"
 #include "cpu/m6502/m6502.h"
 #include "deprecat.h"
-#include "atarifb.h"
+#include "includes/atarifb.h"
 #include "sound/discrete.h"
 
 #include "atarifb.lh"

src/mame/drivers/atarig1.c

@@ -22,7 +22,7 @@
 #include "cpu/m68000/m68000.h"
 #include "audio/atarijsa.h"
 #include "video/atarirle.h"
-#include "atarig1.h"
+#include "includes/atarig1.h"
 
 
 

src/mame/drivers/atarig42.c

@@ -22,7 +22,7 @@
 #include "machine/asic65.h"
 #include "audio/atarijsa.h"
 #include "video/atarirle.h"
-#include "atarig42.h"
+#include "includes/atarig42.h"
 
 
 /*************************************

src/mame/drivers/atarigt.c

@@ -23,7 +23,7 @@
 #include "video/atarirle.h"
 #include "cpu/m68000/m68000.h"
 #include "audio/cage.h"
-#include "atarigt.h"
+#include "includes/atarigt.h"
 
 
 #define LOG_PROTECTION		(0)

src/mame/drivers/atarigx2.c

@@ -23,7 +23,7 @@
 #include "cpu/m68000/m68000.h"
 #include "audio/atarijsa.h"
 #include "video/atarirle.h"
-#include "atarigx2.h"
+#include "includes/atarigx2.h"
 
 
 

src/mame/drivers/atarisy1.c

@@ -173,7 +173,7 @@
 #include "cpu/m6502/m6502.h"
 #include "machine/atarigen.h"
 #include "machine/6522via.h"
-#include "atarisy1.h"
+#include "includes/atarisy1.h"
 #include "sound/tms5220.h"
 #include "sound/2151intf.h"
 #include "sound/pokey.h"

src/mame/drivers/atarisy2.c

@@ -126,8 +126,8 @@
 #include "driver.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/t11/t11.h"
-#include "slapstic.h"
-#include "atarisy2.h"
+#include "includes/slapstic.h"
+#include "includes/atarisy2.h"
 #include "sound/tms5220.h"
 #include "sound/2151intf.h"
 #include "sound/pokey.h"

src/mame/drivers/ataxx.c

@@ -29,7 +29,7 @@
 #include "cpu/i86/i86.h"
 #include "machine/eeprom.h"
 #include "cpu/z80/z80.h"
-#include "leland.h"
+#include "includes/leland.h"
 #include "sound/2151intf.h"
 
 

src/mame/drivers/atetris.c

@@ -49,8 +49,8 @@
 
 #include "driver.h"
 #include "cpu/m6502/m6502.h"
-#include "slapstic.h"
-#include "atetris.h"
+#include "includes/slapstic.h"
+#include "includes/atetris.h"
 #include "sound/sn76496.h"
 #include "sound/pokey.h"
 #include "state.h"

src/mame/drivers/avalnche.c

@@ -31,7 +31,7 @@
 #include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/discrete.h"
-#include "avalnche.h"
+#include "includes/avalnche.h"
 
 #include "avalnche.lh"
 

src/mame/drivers/aztarac.c

@@ -17,7 +17,7 @@
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "video/vector.h"
-#include "aztarac.h"
+#include "includes/aztarac.h"
 #include "sound/ay8910.h"
 
 

src/mame/drivers/backfire.c

@@ -12,13 +12,13 @@
 
 #define DE156CPU ARM
 #include "driver.h"
-#include "decocrpt.h"
-#include "deco32.h"
+#include "includes/decocrpt.h"
+#include "includes/deco32.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 #include "sound/ymz280b.h"
 #include "cpu/arm/arm.h"
-#include "deco16ic.h"
+#include "includes/deco16ic.h"
 #include "rendlay.h"
 
 static UINT32 *backfire_spriteram32_1;

src/mame/drivers/badlands.c

@@ -165,7 +165,7 @@ Measurements -
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/m6502/m6502.h"
-#include "badlands.h"
+#include "includes/badlands.h"
 #include "sound/2151intf.h"
 
 

src/mame/drivers/balsente.c

@@ -228,7 +228,7 @@ DIP locations verified for:
 #include "cpu/z80/z80.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m68000/m68000.h"
-#include "balsente.h"
+#include "includes/balsente.h"
 #include "sound/cem3394.h"
 
 #include "stocker.lh"

src/mame/drivers/bankp.c

@@ -94,7 +94,7 @@
 #include "driver.h"
 #include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
-#include "bankp.h"
+#include "includes/bankp.h"
 
 
 /*************************************

src/mame/drivers/batman.c

@@ -20,7 +20,7 @@
 #include "driver.h"
 #include "cpu/m68000/m68000.h"
 #include "audio/atarijsa.h"
-#include "batman.h"
+#include "includes/batman.h"
 
 
 

src/mame/drivers/battlane.c

@@ -12,7 +12,7 @@
 #include "driver.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/3526intf.h"
-#include "battlane.h"
+#include "includes/battlane.h"
 
 /*************************************
  *

src/mame/drivers/battlex.c

@@ -47,7 +47,7 @@
 #include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
-#include "battlex.h"
+#include "includes/battlex.h"
 
 
 /*************************************

src/mame/drivers/beathead.c

@@ -101,7 +101,7 @@
 #include "cpu/asap/asap.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
-#include "beathead.h"
+#include "includes/beathead.h"
 
 
 

src/mame/drivers/berzerk.c

@@ -10,7 +10,7 @@
 
 #include "driver.h"
 #include "cpu/z80/z80.h"
-#include "exidy.h"
+#include "includes/exidy.h"
 #include "machine/74181.h"
 #include "sound/s14001a.h"
 #include "video/resnet.h"

src/mame/drivers/bionicc.c

@@ -59,7 +59,7 @@
 #include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/2151intf.h"
-#include "bionicc.h"
+#include "includes/bionicc.h"
 
 #define MASTER_CLOCK       XTAL_24MHz
 #define EXO3_F0_CLK        XTAL_14_31818MHz

src/mame/drivers/blktiger.c

@@ -17,7 +17,7 @@
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "cpu/mcs51/mcs51.h"
-#include "blktiger.h"
+#include "includes/blktiger.h"
 
 
 /**************************************************

src/mame/drivers/blmbycar.c

@@ -26,7 +26,7 @@ Check game speed, it depends on a bit we toggle..
 #include "driver.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
-#include "blmbycar.h"
+#include "includes/blmbycar.h"
 
 
 /***************************************************************************

src/mame/drivers/blockout.c

@@ -70,7 +70,7 @@
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
-#include "blockout.h"
+#include "includes/blockout.h"
 
 
 static INTERRUPT_GEN( blockout_interrupt )

src/mame/drivers/blstroid.c

@@ -21,7 +21,7 @@
 #include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
-#include "blstroid.h"
+#include "includes/blstroid.h"
 
 
 

src/mame/drivers/blueprnt.c

@@ -56,7 +56,7 @@
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
-#include "blueprnt.h"
+#include "includes/blueprnt.h"
 
 /*************************************
  *

src/mame/drivers/bogeyman.c

@@ -15,7 +15,7 @@
 #include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
-#include "bogeyman.h"
+#include "includes/bogeyman.h"
 
 
 /* Read/Write Handlers */

src/mame/drivers/bombjack.c

@@ -98,7 +98,7 @@ Dip Locations and factory settings verified with manual
 #include "driver.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
-#include "bombjack.h"
+#include "includes/bombjack.h"
 
 
 static TIMER_CALLBACK( soundlatch_callback )

src/mame/drivers/boogwing.c

@@ -81,9 +81,9 @@
 #include "driver.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/h6280/h6280.h"
-#include "decocrpt.h"
-#include "deco16ic.h"
-#include "decoprot.h"
+#include "includes/decocrpt.h"
+#include "includes/deco16ic.h"
+#include "includes/decoprot.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 

src/mame/drivers/brkthru.c

@@ -53,7 +53,7 @@
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/3526intf.h"
-#include "brkthru.h"
+#include "includes/brkthru.h"
 
 
 #define MASTER_CLOCK		XTAL_12MHz

src/mame/drivers/bsktball.c

@@ -26,7 +26,7 @@
 #include "driver.h"
 #include "cpu/m6502/m6502.h"
 #include "deprecat.h"
-#include "bsktball.h"
+#include "includes/bsktball.h"
 #include "sound/discrete.h"
 
 

src/mame/drivers/btoads.c

@@ -10,7 +10,7 @@
 #include "cpu/z80/z80.h"
 #include "cpu/tms34010/tms34010.h"
 #include "video/tlc34076.h"
-#include "btoads.h"
+#include "includes/btoads.h"
 #include "sound/bsmt2000.h"
 
 

src/mame/drivers/bwing.c

@@ -28,7 +28,7 @@ Known issues:
 #include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
-#include "bwing.h"
+#include "includes/bwing.h"
 
 
 //****************************************************************************