diff --git a/src/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/src/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
index 013db023..010871cb 100644
--- a/src/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/src/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -916,7 +916,7 @@
     <ClCompile Include="..\..\..\machine\jumpshot.c" />
     <ClCompile Include="..\..\..\machine\kabuki.c" />
     <ClCompile Include="..\..\..\machine\konami.c" />
-    <ClCompile Include="..\..\..\machine\konamigx.c" />
+    <ClCompile Include="..\..\..\machine\konamigx_machine.c" />
     <ClCompile Include="..\..\..\machine\kyugo.c" />
     <ClCompile Include="..\..\..\machine\leland.c" />
     <ClCompile Include="..\..\..\machine\leprechn.c" />
@@ -1377,7 +1377,7 @@
     <ClCompile Include="..\..\..\vidhrdw\gotcha.c" />
     <ClCompile Include="..\..\..\vidhrdw\gottlieb.c" />
     <ClCompile Include="..\..\..\vidhrdw\gotya.c" />
-    <ClCompile Include="..\..\..\vidhrdw\gradius3.c" />
+    <ClCompile Include="..\..\..\vidhrdw\gradius3_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\grchamp.c" />
     <ClCompile Include="..\..\..\vidhrdw\gridlee.c" />
     <ClCompile Include="..\..\..\vidhrdw\grobda.c" />
@@ -1426,7 +1426,7 @@
     <ClCompile Include="..\..\..\vidhrdw\kinst.c" />
     <ClCompile Include="..\..\..\vidhrdw\klax_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\kncljoe.c" />
-    <ClCompile Include="..\..\..\vidhrdw\konamigx.c" />
+    <ClCompile Include="..\..\..\vidhrdw\konamigx_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\konamiic.c" />
     <ClCompile Include="..\..\..\vidhrdw\kopunch.c" />
     <ClCompile Include="..\..\..\vidhrdw\kyugo.c" />
@@ -1489,7 +1489,7 @@
     <ClCompile Include="..\..\..\vidhrdw\mnight.c" />
     <ClCompile Include="..\..\..\vidhrdw\mole.c" />
     <ClCompile Include="..\..\..\vidhrdw\momoko.c" />
-    <ClCompile Include="..\..\..\vidhrdw\moo.c" />
+    <ClCompile Include="..\..\..\vidhrdw\moo_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\mosaic.c" />
     <ClCompile Include="..\..\..\vidhrdw\mouser_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\mpatrol.c" />
@@ -1556,7 +1556,7 @@
     <ClCompile Include="..\..\..\vidhrdw\pkunwar.c" />
     <ClCompile Include="..\..\..\vidhrdw\playch10.c" />
     <ClCompile Include="..\..\..\vidhrdw\playmark_vidhrdw.c" />
-    <ClCompile Include="..\..\..\vidhrdw\plygonet.c" />
+    <ClCompile Include="..\..\..\vidhrdw\plygonet_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\polepos.c" />
     <ClCompile Include="..\..\..\vidhrdw\policetr.c" />
     <ClCompile Include="..\..\..\vidhrdw\poly.c" />
@@ -1724,7 +1724,7 @@
     <ClCompile Include="..\..\..\vidhrdw\timelimt.c" />
     <ClCompile Include="..\..\..\vidhrdw\timeplt.c" />
     <ClCompile Include="..\..\..\vidhrdw\tlc34076.c" />
-    <ClCompile Include="..\..\..\vidhrdw\tmnt.c" />
+    <ClCompile Include="..\..\..\vidhrdw\tmnt_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\tms34061.c" />
     <ClCompile Include="..\..\..\vidhrdw\tms9928a.c" />
     <ClCompile Include="..\..\..\vidhrdw\tnzs.c" />
@@ -1784,7 +1784,7 @@
     <ClCompile Include="..\..\..\vidhrdw\xain.c" />
     <ClCompile Include="..\..\..\vidhrdw\xevious.c" />
     <ClCompile Include="..\..\..\vidhrdw\xexex.c" />
-    <ClCompile Include="..\..\..\vidhrdw\xmen.c" />
+    <ClCompile Include="..\..\..\vidhrdw\xmen_vidhrdw.c" />
     <ClCompile Include="..\..\..\vidhrdw\xorworld.c" />
     <ClCompile Include="..\..\..\vidhrdw\xxmissio.c" />
     <ClCompile Include="..\..\..\vidhrdw\xybots.c" />
diff --git a/src/machine/konamigx.c b/src/machine/konamigx_machine.c
similarity index 100%
rename from src/machine/konamigx.c
rename to src/machine/konamigx_machine.c
diff --git a/src/mame.mak b/src/mame.mak
index 28f62ea6..09d2c279 100644
--- a/src/mame.mak
+++ b/src/mame.mak
@@ -589,18 +589,18 @@ COREOBJS += \
 	$(OBJ)/vidhrdw/ultraman.o $(OBJ)/drivers/ultraman.o \
 	$(OBJ)/vidhrdw/hexion.o $(OBJ)/drivers/hexion.o \
 	$(OBJ)/vidhrdw/twin16.o $(OBJ)/drivers/twin16.o \
-	$(OBJ)/vidhrdw/tmnt.o $(OBJ)/drivers/tmnt.o \
-	$(OBJ)/vidhrdw/xmen.o $(OBJ)/drivers/xmen.o \
+	$(OBJ)/vidhrdw/tmnt_vidhrdw.o $(OBJ)/drivers/tmnt.o \
+	$(OBJ)/vidhrdw/xmen_vidhrdw.o $(OBJ)/drivers/xmen.o \
 	$(OBJ)/vidhrdw/overdriv.o $(OBJ)/drivers/overdriv.o \
-	$(OBJ)/vidhrdw/gradius3.o $(OBJ)/drivers/gradius3.o \
-	$(OBJ)/vidhrdw/moo.o $(OBJ)/drivers/moo.o \
+	$(OBJ)/vidhrdw/gradius3_vidhrdw.o $(OBJ)/drivers/gradius3.o \
+	$(OBJ)/vidhrdw/moo_vidhrdw.o $(OBJ)/drivers/moo.o \
 	$(OBJ)/vidhrdw/mystwarr.o $(OBJ)/drivers/mystwarr.o \
 	$(OBJ)/vidhrdw/rungun.o $(OBJ)/drivers/rungun.o \
 	$(OBJ)/vidhrdw/dbz2.o $(OBJ)/drivers/dbz2.o \
 	$(OBJ)/vidhrdw/bishi.o $(OBJ)/drivers/bishi.o \
-	$(OBJ)/machine/konamigx.o $(OBJ)/vidhrdw/konamigx.o $(OBJ)/drivers/konamigx.o \
+	$(OBJ)/machine/konamigx_machine.o $(OBJ)/vidhrdw/konamigx_vidhrdw.o $(OBJ)/drivers/konamigx.o \
 	$(OBJ)/vidhrdw/djmain.o $(OBJ)/drivers/djmain.o \
-	$(OBJ)/vidhrdw/plygonet.o $(OBJ)/drivers/plygonet.o \
+	$(OBJ)/vidhrdw/plygonet_vidhrdw.o $(OBJ)/drivers/plygonet.o \
 	$(OBJ)/drivers/mogura.o \
 	$(OBJ)/machine/am53cf96.o $(OBJ)/drivers/konamigq.o \
 
diff --git a/src/vidhrdw/gradius3.c b/src/vidhrdw/gradius3_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/gradius3.c
rename to src/vidhrdw/gradius3_vidhrdw.c
diff --git a/src/vidhrdw/konamigx.c b/src/vidhrdw/konamigx_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/konamigx.c
rename to src/vidhrdw/konamigx_vidhrdw.c
diff --git a/src/vidhrdw/moo.c b/src/vidhrdw/moo_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/moo.c
rename to src/vidhrdw/moo_vidhrdw.c
diff --git a/src/vidhrdw/plygonet.c b/src/vidhrdw/plygonet_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/plygonet.c
rename to src/vidhrdw/plygonet_vidhrdw.c
diff --git a/src/vidhrdw/tmnt.c b/src/vidhrdw/tmtn_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/tmnt.c
rename to src/vidhrdw/tmtn_vidhrdw.c
diff --git a/src/vidhrdw/xmen.c b/src/vidhrdw/xmen_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/xmen.c
rename to src/vidhrdw/xmen_vidhrdw.c