diff --git a/Makefile.common b/Makefile.common
index 18e76d66c6..b4cc28e978 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1565,10 +1565,6 @@ ifeq ($(HAVE_CHD), 1)
               $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \
               $(LIBRETRO_COMM_DIR)/streams/chd_stream.o
 	
-   ifeq ($(HAVE_FLAC), 1)
-      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
-             $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o
-   endif
 
    ifeq ($(HAVE_7ZIP), 1)
       OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_lzma.o
@@ -1576,6 +1572,10 @@ ifeq ($(HAVE_CHD), 1)
 
    ifeq ($(HAVE_ZLIB), 1)
       OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zlib.o
+   ifeq ($(HAVE_FLAC),1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
+             $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o
+   endif
    endif
 endif