build with MSVC (nw)

src/devices/cpu/mips/ps2vif1.cpp

@@ -11,10 +11,8 @@
 *
 */
 
+#include "emu.h"
 #include "ps2vif1.h"
-#include "ps2vu.h"
-#include "video/ps2gs.h"
-#include "video/ps2gif.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_VIF1, ps2_vif1_device, "ps2vif1", "PlayStation 2 VIF1")
 

src/devices/cpu/mips/ps2vif1.h

@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "emu.h"
-
 class ps2_gs_device;
 class sonyvu1_device;
 
@@ -157,4 +155,7 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_VIF1, ps2_vif1_device)
 
-#endif // DEVICES_MACHINE_PS2VIF1_H
+#include "video/ps2gs.h"
+#include "ps2vu.h"
+
+#endif // DEVICES_MACHINE_PS2VIF1_H

src/devices/cpu/mips/ps2vu.h

@@ -242,4 +242,7 @@ protected:
 DECLARE_DEVICE_TYPE(SONYPS2_VU1, sonyvu1_device)
 DECLARE_DEVICE_TYPE(SONYPS2_VU0, sonyvu0_device)
 
-#endif // MAME_CPU_MIPS_PS2VU_H
+#include "video/ps2gs.h"
+#include "cpu/mips/ps2vif1.h"
+
+#endif // MAME_CPU_MIPS_PS2VU_H

src/devices/machine/ps2dma.cpp

@@ -9,7 +9,7 @@
 *
 */
 
-#include "ps2sif.h"
+#include "emu.h"
 #include "ps2dma.h"
 #include "cpu/mips/mips3.h"
 #include "cpu/mips/ps2vif1.h"

src/devices/machine/ps2dma.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "emu.h"
+#include "ps2sif.h"
 #include "video/ps2gs.h"
 #include "cpu/mips/ps2vu.h"
 
@@ -148,4 +148,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_DMAC, ps2_dmac_device)
 
-#endif // DEVICES_MACHINE_PS2DMAC_H
+#endif // DEVICES_MACHINE_PS2DMAC_H

src/devices/machine/ps2intc.cpp

@@ -9,8 +9,8 @@
 *
 */
 
+#include "emu.h"
 #include "ps2intc.h"
-#include "cpu/mips/ps2vu.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device, "ps2intc", "PlayStation 2 EE INTC")
 

src/devices/machine/ps2intc.h

@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include "emu.h"
 #include "cpu/mips/mips3.h"
 
 class ps2_intc_device : public device_t
@@ -67,4 +66,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device)
 
-#endif // DEVICES_MACHINE_PS2INTC_H
+#endif // DEVICES_MACHINE_PS2INTC_H

src/devices/machine/ps2mc.cpp

@@ -9,6 +9,7 @@
 *
 */
 
+#include "emu.h"
 #include "ps2mc.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_MC, ps2_mc_device, "ps2mc", "PlayStation 2 Memory Card")

src/devices/machine/ps2mc.h

@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "emu.h"
-
 class ps2_mc_device : public device_t
 {
 public:
@@ -72,4 +70,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_MC, ps2_mc_device)
 
-#endif // DEVICES_MACHINE_PS2MC_H
+#endif // DEVICES_MACHINE_PS2MC_H

src/devices/machine/ps2pad.cpp

@@ -9,6 +9,7 @@
 *
 */
 
+#include "emu.h"
 #include "ps2pad.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_PAD, ps2_pad_device, "ps2pad", "Sony DualShock 2")

src/devices/machine/ps2pad.h

@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "emu.h"
-
 class ps2_pad_device : public device_t
 {
 public:
@@ -75,4 +73,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_PAD, ps2_pad_device)
 
-#endif // DEVICES_MACHINE_PS2PAD_H
+#endif // DEVICES_MACHINE_PS2PAD_H

src/devices/machine/ps2sif.cpp

@@ -9,8 +9,8 @@
 *
 */
 
+#include "emu.h"
 #include "ps2sif.h"
-#include "cpu/mips/ps2vu.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_SIF, ps2_sif_device, "ps2sif", "PlayStation 2 SIF")
 

src/devices/machine/ps2sif.h

@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include "emu.h"
 #include "ps2intc.h"
 
 class ps2_sif_device : public device_t
@@ -58,4 +57,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_SIF, ps2_sif_device)
 
-#endif // DEVICES_MACHINE_PS2SIF_H
+#endif // DEVICES_MACHINE_PS2SIF_H

src/devices/video/ps2gif.cpp

@@ -9,9 +9,8 @@
 *
 */
 
+#include "emu.h"
 #include "ps2gif.h"
-#include "ps2gs.h"
-#include "cpu/mips/ps2vu.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_GIF, ps2_gif_device, "ps2gif", "Playstation 2 GIF")
 

src/devices/video/ps2gif.h

@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "emu.h"
-
 class ps2_gs_device;
 class sonyvu1_device;
 
@@ -127,4 +125,7 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_GIF, ps2_gif_device)
 
-#endif // DEVICES_VIDEO_PS2GIF_H
+#include "ps2gs.h"
+#include "cpu/mips/ps2vu.h"
+
+#endif // DEVICES_VIDEO_PS2GIF_H

src/devices/video/ps2gs.cpp

@@ -9,9 +9,8 @@
 *
 */
 
+#include "emu.h"
 #include "ps2gs.h"
-#include "ps2gif.h"
-#include "cpu/mips/ps2vu.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
 
@@ -752,4 +751,4 @@ READ32_MEMBER(ps2_gs_device::gif_r)
 WRITE32_MEMBER(ps2_gs_device::gif_w)
 {
 	m_gif->write(space, offset, data, mem_mask);
-}
+}

src/devices/video/ps2gs.h

@@ -14,9 +14,7 @@
 
 #pragma once
 
-#include "emu.h"
-#include "machine/ps2intc.h"
-
+class ps2_intc_device;
 class ps2_gif_device;
 class sonyvu1_device;
 
@@ -313,4 +311,8 @@ protected:
 
 DECLARE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device)
 
-#endif // DEVICES_VIDEO_PS2GS_H
+#include "ps2gif.h"
+#include "cpu/mips/ps2vu.h"
+#include "machine/ps2intc.h"
+
+#endif // DEVICES_VIDEO_PS2GS_H