From f871b84c9ea89f444b8c546e6878803d6b6d72e8 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Sun, 24 Jun 2018 20:52:40 +1000
Subject: [PATCH] small cleanup (nw)

---
 src/devices/machine/intelfsh.h | 3 ---
 src/devices/machine/pxa255.cpp | 1 +
 src/devices/machine/pxa255.h   | 7 +++----
 src/mame/video/shangha3.cpp    | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h
index cadcf30cabc..9f93f40e49c 100644
--- a/src/devices/machine/intelfsh.h
+++ b/src/devices/machine/intelfsh.h
@@ -111,9 +111,6 @@
 //  TYPE DEFINITIONS
 //**************************************************************************
 
-class intelfsh_device;
-
-
 // ======================> intelfsh_device
 
 class intelfsh_device : public device_t,
diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp
index 6bfb7276673..0e96fec2b27 100644
--- a/src/devices/machine/pxa255.cpp
+++ b/src/devices/machine/pxa255.cpp
@@ -9,6 +9,7 @@
  *
  **************************************************************************/
 
+#include "emu.h"
 #include "pxa255.h"
 
 #include "screen.h"
diff --git a/src/devices/machine/pxa255.h b/src/devices/machine/pxa255.h
index 45fd1f25cb6..4f0ce7bdab6 100644
--- a/src/devices/machine/pxa255.h
+++ b/src/devices/machine/pxa255.h
@@ -9,12 +9,11 @@
  *
  **************************************************************************/
 
-#ifndef DEVICES_MACHINE_PXA255
-#define DEVICES_MACHINE_PXA255
+#ifndef MAME_MACHINE_PXA255
+#define MAME_MACHINE_PXA255
 
 #pragma once
 
-#include "emu.h"
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
 #include "sound/dmadac.h"
@@ -232,4 +231,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(PXA255_PERIPHERALS, pxa255_periphs_device)
 
-#endif // DEVICES_MACHINE_PXA255
+#endif // MAME_MACHINE_PXA255
diff --git a/src/mame/video/shangha3.cpp b/src/mame/video/shangha3.cpp
index e0921532784..bea7ff21452 100644
--- a/src/mame/video/shangha3.cpp
+++ b/src/mame/video/shangha3.cpp
@@ -144,8 +144,8 @@ WRITE16_MEMBER(shangha3_state::blitter_go_w)
 		{
 			rectangle myclip;
 
-//			if (shangha3_ram[offs+11] || shangha3_ram[offs+12])
-//			logerror("offs %04x: sx %04x sy %04x zoom %04x %04x %04x %04x fx %d fy %d\n",offs,sx,sy,zoomx,shangha3_ram[offs+11]),shangha3_ram[offs+12],zoomy,flipx,flipy);
+//          if (shangha3_ram[offs+11] || shangha3_ram[offs+12])
+//              logerror("offs %04x: sx %04x sy %04x zoom %04x %04x %04x %04x fx %d fy %d\n",offs,sx,sy,zoomx,shangha3_ram[offs+11]),shangha3_ram[offs+12],zoomy,flipx,flipy);
 
 			myclip.set(sx, sx + sizex, sy, sy + sizey);
 			myclip &= rawbitmap.cliprect();