diff --git a/Makefile.common b/Makefile.common
index 5de5f3d9b9..44e6b5652a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1500,11 +1500,11 @@ ifeq ($(HAVE_7ZIP), 1)
 ifeq ($(HAVE_ZLIB), 1)
    DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
    CFLAGS  += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
-   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/bitstream.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/cdrom.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/chd.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/flac.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/huffman.o \
+   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \
               $(LIBRETRO_COMM_DIR)/streams/chd_stream.o
 endif
 endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d2b12c0674..e71cb8753f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1307,11 +1307,11 @@ DEPENDENCIES
 #endif
 
 #ifdef HAVE_CHD
-#include "../libretro-common/formats/libchdr/bitstream.c"
-#include "../libretro-common/formats/libchdr/cdrom.c"
-#include "../libretro-common/formats/libchdr/chd.c"
-#include "../libretro-common/formats/libchdr/flac.c"
-#include "../libretro-common/formats/libchdr/huffman.c"
+#include "../libretro-common/formats/libchdr/libchdr_bitstream.c"
+#include "../libretro-common/formats/libchdr/libchdr_cdrom.c"
+#include "../libretro-common/formats/libchdr/libchdr_chd.c"
+#include "../libretro-common/formats/libchdr/libchdr_flac.c"
+#include "../libretro-common/formats/libchdr/libchdr_huffman.c"
 
 #include "../libretro-common/streams/chd_stream.c"
 #endif
diff --git a/libretro-common/formats/libchdr/bitstream.c b/libretro-common/formats/libchdr/libchdr_bitstream.c
similarity index 100%
rename from libretro-common/formats/libchdr/bitstream.c
rename to libretro-common/formats/libchdr/libchdr_bitstream.c
diff --git a/libretro-common/formats/libchdr/cdrom.c b/libretro-common/formats/libchdr/libchdr_cdrom.c
similarity index 100%
rename from libretro-common/formats/libchdr/cdrom.c
rename to libretro-common/formats/libchdr/libchdr_cdrom.c
diff --git a/libretro-common/formats/libchdr/chd.c b/libretro-common/formats/libchdr/libchdr_chd.c
similarity index 100%
rename from libretro-common/formats/libchdr/chd.c
rename to libretro-common/formats/libchdr/libchdr_chd.c
diff --git a/libretro-common/formats/libchdr/flac.c b/libretro-common/formats/libchdr/libchdr_flac.c
similarity index 100%
rename from libretro-common/formats/libchdr/flac.c
rename to libretro-common/formats/libchdr/libchdr_flac.c
diff --git a/libretro-common/formats/libchdr/huffman.c b/libretro-common/formats/libchdr/libchdr_huffman.c
similarity index 100%
rename from libretro-common/formats/libchdr/huffman.c
rename to libretro-common/formats/libchdr/libchdr_huffman.c