diff --git a/Makefile.common b/Makefile.common
index 7e2b31fb3c..b1a0dbe006 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -794,10 +794,9 @@ endif
 ifeq ($(HAVE_RPNG), 1)
    OBJ += libretro-common/formats/png/rpng.o \
 			 libretro-common/formats/png/rpng_encode.o
-else
-	OBJ += libretro-common/formats/bmp/rbmp_encode.o
 endif
-OBJ += libretro-common/formats/tga/tga_decode.o
+OBJ += libretro-common/formats/bmp/rbmp_encode.o \
+		 libretro-common/formats/tga/tga_decode.o
 
 ifdef HAVE_COMPRESSION
    DEFINES += -DHAVE_COMPRESSION
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 437b062709..b4244ccdd0 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -176,9 +176,8 @@ VIDEO IMAGE
 #ifdef HAVE_RPNG
 #include "../libretro-common/formats/png/rpng.c"
 #include "../libretro-common/formats/png/rpng_encode.c"
-#else
-#include "../libretro-common/formats/bmp/rbmp_encode.c"
 #endif
+#include "../libretro-common/formats/bmp/rbmp_encode.c"
 
 /*============================================================
 VIDEO DRIVER
diff --git a/screenshot.c b/screenshot.c
index 7702759375..610ad5b605 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -31,11 +31,12 @@
 #include <file/file_path.h>
 #include <compat/strl.h>
 
+#include <formats/rbmp.h>
+
 #if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
 #include <formats/rpng.h>
 #define IMG_EXT "png"
 #else
-#include <formats/rbmp.h>
 #define IMG_EXT "bmp"
 #endif