diff --git a/cores/libretro-imageviewer/image_core.c b/cores/libretro-imageviewer/image_core.c
index d1306f3a9d..be78b7747e 100644
--- a/cores/libretro-imageviewer/image_core.c
+++ b/cores/libretro-imageviewer/image_core.c
@@ -9,7 +9,9 @@
 #include <file/file_path.h>
 #include <compat/strl.h>
 
-//#define HAVE_STB_IMAGE
+#if 0
+#define HAVE_STB_IMAGE
+#endif
 
 #ifdef HAVE_STB_IMAGE
 #define STB_IMAGE_IMPLEMENTATION
diff --git a/file_path_special.h b/file_path_special.h
index b3bb673067..d3fed7ed74 100644
--- a/file_path_special.h
+++ b/file_path_special.h
@@ -40,7 +40,7 @@ enum file_path_enum
    FILE_PATH_CORE_THUMBNAILS_URL,
    FILE_PATH_INDEX_DIRS_URL,
    FILE_PATH_INDEX_URL,
-   FILE_PATH_INDEX_EXTENDED_URL,
+   FILE_PATH_INDEX_EXTENDED_URL
 };
 
 enum application_special_type
diff --git a/libretro-common/queues/task_queue.c b/libretro-common/queues/task_queue.c
index 34676d9b9b..c53688b6af 100644
--- a/libretro-common/queues/task_queue.c
+++ b/libretro-common/queues/task_queue.c
@@ -55,6 +55,10 @@ static task_queue_t tasks_finished = {NULL, NULL};
 static void task_queue_msg_push(unsigned prio, unsigned duration,
       bool flush, const char *fmt, ...)
 {
+#ifdef RARCH_INTERNAL
+   extern void runloop_msg_queue_push(const char *msg, unsigned prio,
+         unsigned duration, bool flush);
+#endif
    char buf[1024];
    va_list ap;
    
@@ -66,8 +70,6 @@ static void task_queue_msg_push(unsigned prio, unsigned duration,
 
 #ifdef RARCH_INTERNAL
    /* TODO/FIXME - ugly */
-   extern void runloop_msg_queue_push(const char *msg, unsigned prio,
-         unsigned duration, bool flush);
    runloop_msg_queue_push(buf, prio, duration, flush);
 #endif
 }
diff --git a/qb/config.params.sh b/qb/config.params.sh
index fadf29e36b..b6cc9ae77e 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -70,8 +70,6 @@ HAVE_7ZIP=yes              # Compile in 7z support
 HAVE_PRESERVE_DYLIB=no     # Enable dlclose() for Valgrind support
 HAVE_PARPORT=auto          # Parallel port joypad support
 HAVE_IMAGEVIEWER=yes       # Built-in image viewer support.
-C89_IMAGEVIEWER=no         # stb_image hates C89
-C90_IMAGEVIEWER=no         # stb_image hates C90
 HAVE_MMAP=auto             # MMAP support
 HAVE_QT=no                 # QT companion support
 HAVE_XSHM=no               # XShm video driver support (disabled because it's just a dummied out stub)