diff --git a/Makefile.common b/Makefile.common
index dfe3772c1e..b869261baa 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -904,8 +904,13 @@ ifeq ($(HAVE_RPNG), 1)
    OBJ += libretro-common/formats/png/rpng.o \
           libretro-common/formats/png/rpng_encode.o
 endif
-OBJ += libretro-common/formats/jpeg/rjpeg.o \
-		 libretro-common/formats/bmp/rbmp_encode.o \
+
+ifeq ($(HAVE_RJPEG), 1)
+	DEFINES += -DHAVE_RJPEG
+	OBJ += libretro-common/formats/jpeg/rjpeg.o
+endif
+
+OBJ += libretro-common/formats/bmp/rbmp_encode.o \
        libretro-common/formats/tga/rtga.o \
        libretro-common/formats/json/jsonsax.o
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index da142c7151..13c99f3c2c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -232,7 +232,9 @@ VIDEO IMAGE
 #include "../libretro-common/formats/png/rpng.c"
 #include "../libretro-common/formats/png/rpng_encode.c"
 #endif
+#ifdef HAVE_RJPEG
 #include "../libretro-common/formats/jpeg/rjpeg.c"
+#endif
 #include "../libretro-common/formats/bmp/rbmp_encode.c"
 
 /*============================================================
diff --git a/qb/config.params.sh b/qb/config.params.sh
index e69da313e8..6c4ca9414a 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -78,3 +78,4 @@ HAVE_CHEEVOS=yes           # Retro Achievements
 HAVE_VULKAN=auto           # Vulkan support
 C89_VULKAN=no
 HAVE_RPNG=yes              # RPNG support
+HAVE_RJPEG=yes             # RJPEG support
diff --git a/tasks/task_image.c b/tasks/task_image.c
index ea6e504279..f3c442219f 100644
--- a/tasks/task_image.c
+++ b/tasks/task_image.c
@@ -117,6 +117,8 @@ static int rarch_main_data_image_process(
 #endif
          break;
       case IMAGE_TYPE_JPEG:
+#ifdef HAVE_RJPEG
+#endif
          break;
    }
 
@@ -207,6 +209,8 @@ static int rarch_main_data_image_iterate_transfer(nbio_handle_t *nbio)
 #endif
             break;
          case IMAGE_TYPE_JPEG:
+#ifdef HAVE_RJPEG
+#endif
             break;
       }
    }
@@ -232,6 +236,8 @@ static void rarch_task_image_load_free_internal(nbio_handle_t *nbio)
 #endif
          break;
       case IMAGE_TYPE_JPEG:
+#ifdef HAVE_RJPEG
+#endif
          break;
    }
 
@@ -260,6 +266,8 @@ static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
 #endif
          break;
       case IMAGE_TYPE_JPEG:
+#ifdef HAVE_RJPEG
+#endif
          break;
    }
 
@@ -275,6 +283,8 @@ static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
 #endif
          break;
       case IMAGE_TYPE_JPEG:
+#ifdef HAVE_RJPEG
+#endif
          break;
    }
 
@@ -304,6 +314,8 @@ static int cb_nbio_image_menu_thumbnail(void *data, size_t len)
 #endif
          break;
       case IMAGE_TYPE_JPEG:
+#ifdef HAVE_RJPEG
+#endif
          break;
    }