diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index d925dba382a..f27b1fd9731 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -1,5 +1,4 @@
 #include "driver.h"
-#include "deprecat.h"
 #include "sound/es5506.h"
 #include "includes/taito_f3.h"
 #include "taito_en.h"
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index e9e972f5824..5f6cf846936 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -20,7 +20,6 @@
 #include "driver.h"
 #include "cpu/cubeqcpu/cubeqcpu.h"
 #include "sound/dac.h"
-#include "deprecat.h"
 #include "sound/custom.h"
 #include "streams.h"
 #include "machine/laserdsc.h"
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 0e5d7f70f1f..c77422c41d7 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -110,6 +110,7 @@ Few words about protection:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 41fce8fa8f2..242d0e2b1ad 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -101,6 +101,7 @@ OSC:    12.000MHz
 *******************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 240833ec5e0..8f4e3436e9e 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -2608,7 +2608,7 @@ static WRITE16_HANDLER( _32x_68k_palette_w )
 
 	_32x_palette_lookup[offset] = (r << 10) | (g << 5) | (b << 0) | (p << 15);
 
-	palette_set_color_rgb(Machine,offset+0x40,pal5bit(r),pal5bit(g),pal5bit(b));
+	palette_set_color_rgb(space->machine,offset+0x40,pal5bit(r),pal5bit(g),pal5bit(b));
 
 }
 
@@ -5539,7 +5539,7 @@ static void genesis_render_videobuffer_to_screenbuffer(running_machine *machine,
 					case 0x1a000: // (sprite)shadow set, highlight set - not possible
 					case 0x1e000: // (sprite)shadow set, highlight set, normal set, not possible
 					default:
-						lineptr[x] = mame_rand(Machine)&0x3f;
+						lineptr[x] = mame_rand(machine)&0x3f;
 					break;
 				}
 			}
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 7466332d0f2..e0098b49b7f 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -44,7 +44,6 @@ Notes:
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 5280373b78a..f8ad5ac3e0b 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -30,7 +30,6 @@ SX008-14.BIN ; /
 
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/mips/r3000.h"
 #include "sound/st0016.h"
 #include "st0016.h"
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index 10f1ed1a88e..f40fcc16af1 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -589,7 +589,7 @@ DRIVER_INIT( revx )
 
 	/* load the graphics ROMs -- quadruples */
 	midyunit_gfx_rom = base = memory_region(machine, "gfx1");
-	len = memory_region_length(Machine, "gfx1");
+	len = memory_region_length(machine, "gfx1");
 	for (i = 0; i < len / 0x200000; i++)
 	{
 		memcpy(midwunit_decode_memory, base, 0x200000);
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index 7679dfba8a4..bd168ecf4f1 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -614,7 +614,7 @@ static STATE_POSTLOAD( updatevisiblearea )
 	visarea.min_x = visarea.min_y = 0;
 	visarea.max_x = m_n_screenwidth - 1;
 	visarea.max_y = m_n_screenheight - 1;
-	video_screen_configure(Machine->primary_screen, m_n_screenwidth, m_n_screenheight, &visarea, HZ_TO_ATTOSECONDS(refresh));
+	video_screen_configure(machine->primary_screen, m_n_screenwidth, m_n_screenheight, &visarea, HZ_TO_ATTOSECONDS(refresh));
 }
 
 static void psx_gpu_init( running_machine *machine )
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index 8ff286b98e4..d5a0ec75c46 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -15,7 +15,6 @@ Tilemap flip flags were reversed
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "includes/suprnova.h"
 
 static bitmap_t *sprite_bitmap;
@@ -30,7 +29,6 @@ static bitmap_t *tilemap_bitmapflags_higher;
 /* draws ROZ with linescroll OR columnscroll to 16-bit indexed bitmap */
 static void suprnova_draw_roz(bitmap_t* bitmap, bitmap_t* bitmapflags, const rectangle *cliprect, tilemap *tmap, UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound, int columnscroll, UINT32* scrollram)
 {
-//  const pen_t *clut = &Machine->pens[0];
 	//bitmap_t *destbitmap = bitmap;
 	bitmap_t *srcbitmap = tilemap_get_pixmap(tmap);
 	bitmap_t *srcbitmapflags = tilemap_get_flagsmap(tmap);
@@ -1081,7 +1079,7 @@ VIDEO_UPDATE(skns)
 			UINT32* dst;
 			UINT16 pri, pri2, pri3;
 			UINT16 bgpri;
-			const pen_t *clut = &Machine->pens[0];
+			const pen_t *clut = &screen->machine->pens[0];
 //          int drawpri;