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 b1bf9bee..368ddf52 100644
--- a/src/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/src/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -1230,7 +1230,7 @@
-
+
@@ -1539,7 +1539,7 @@
-
+
@@ -1792,8 +1792,8 @@
-
-
+
+
diff --git a/src/mame.mak b/src/mame.mak
index 5439910d..2ef29020 100644
--- a/src/mame.mak
+++ b/src/mame.mak
@@ -940,12 +940,12 @@ COREOBJS += \
$(OBJ)/drivers/looping.o \
COREOBJS += \
- $(OBJ)/vidhrdw/paradise.o $(OBJ)/drivers/paradise.o \
- $(OBJ)/vidhrdw/yunsung8.o $(OBJ)/drivers/yunsung8.o \
- $(OBJ)/vidhrdw/yunsun16.o $(OBJ)/drivers/yunsun16.o \
+ $(OBJ)/vidhrdw/paradise_vidhrdw.o $(OBJ)/drivers/paradise.o \
+ $(OBJ)/vidhrdw/yunsung8_vidhrdw.o $(OBJ)/drivers/yunsung8.o \
+ $(OBJ)/vidhrdw/yunsun16_vidhrdw.o $(OBJ)/drivers/yunsun16.o \
COREOBJS += \
- $(OBJ)/vidhrdw/blueprnt.o $(OBJ)/drivers/blueprnt.o \
+ $(OBJ)/vidhrdw/blueprnt_vidhrdw.o $(OBJ)/drivers/blueprnt.o \
COREOBJS += \
$(OBJ)/vidhrdw/fuukifg2.o $(OBJ)/drivers/fuukifg2.o \
diff --git a/src/vidhrdw/blueprnt.c b/src/vidhrdw/blueprnt_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/blueprnt.c
rename to src/vidhrdw/blueprnt_vidhrdw.c
diff --git a/src/vidhrdw/paradise.c b/src/vidhrdw/paradise_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/paradise.c
rename to src/vidhrdw/paradise_vidhrdw.c
diff --git a/src/vidhrdw/yunsun16.c b/src/vidhrdw/yunsun16_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/yunsun16.c
rename to src/vidhrdw/yunsun16_vidhrdw.c
diff --git a/src/vidhrdw/yunsung8.c b/src/vidhrdw/yunsung8_vidhrdw.c
similarity index 100%
rename from src/vidhrdw/yunsung8.c
rename to src/vidhrdw/yunsung8_vidhrdw.c