diff --git a/gfx/video_common.h b/gfx/video_common.h
index 50e9b33296..5fed1a829c 100644
--- a/gfx/video_common.h
+++ b/gfx/video_common.h
@@ -25,6 +25,10 @@
 typedef float GRfloat;
 typedef unsigned int GRuint;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct gfx_fbo_rect
 {
    unsigned img_width;
@@ -88,4 +92,8 @@ bool gfx_coord_array_add(gfx_coord_array_t *ca,
 
 void gfx_coord_array_free(gfx_coord_array_t *ca);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index ec4ebdcc75..612d4f5f41 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -80,21 +80,27 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
          && input_pid   != 0)
    {
       score += 3;
-      //RARCH_LOG("Autoconf: VID/PID match score=%d\n", score);
+#if 0
+      RARCH_LOG("Autoconf: VID/PID match score=%d\n", score);
+#endif
    }
 
    /* Check for name match */
    if (!strcmp(ident, params->name))
    {
       score += 2;
-      //RARCH_LOG("Autoconf: exact name match score=%d\n", score);
+#if 0
+      RARCH_LOG("Autoconf: exact name match score=%d\n", score);
+#endif
    }
    else
    {
       if (ident[0] != '\0' && !strncmp(params->name, ident, strlen(ident)))
       {
          score += 1;
-         //RARCH_LOG("Autoconf: partial name match score=%d\n", score);
+#if 0
+         RARCH_LOG("Autoconf: partial name match score=%d\n", score);
+#endif
       }
    }
    RARCH_LOG("Autoconf: configuration score=%d\n", score);
diff --git a/libretro-common/include/formats/image.h b/libretro-common/include/formats/image.h
index 630957c06c..c27381a71e 100644
--- a/libretro-common/include/formats/image.h
+++ b/libretro-common/include/formats/image.h
@@ -20,6 +20,10 @@
 #include <stdint.h>
 #include <boolean.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum image_process_code
 {
    IMAGE_PROCESS_ERROR     = -2,
@@ -51,4 +55,8 @@ bool texture_image_color_convert(unsigned r_shift,
 bool texture_image_load(struct texture_image *img, const char *path);
 void texture_image_free(struct texture_image *img);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 2bd6ea47af..dc2e6c84c2 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1697,11 +1697,12 @@ static int action_ok_video_resolution(const char *path,
 #else
    if (video_driver_get_video_output_size(&width, &height))
    {
+      char msg[PATH_MAX_LENGTH] = {0};
+
       video_driver_set_video_mode(width, height, true);
       global->console.screen.resolutions.width = width;
       global->console.screen.resolutions.height = height;
 
-      char msg[PATH_MAX_LENGTH] = {0};
       snprintf(msg, sizeof(msg),"Applying: %dx%d\n START to reset",width, height);
       rarch_main_msg_queue_push(msg, 1, 100, true);
    }