diff --git a/Makefile.common b/Makefile.common
index 5ab07913dc..15108e3572 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -455,20 +455,20 @@ ifeq ($(HAVE_PARPORT), 1)
    OBJ += input/drivers_joypad/parport_joypad.o
 endif
 
-OBJ += gfx/video_context_driver.o \
-		 gfx/drivers_context/gfx_null_ctx.o
-
 # Video
 #
 ifeq ($(HAVE_OPENGL), 1)
+
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
-			 gfx/drivers/gl_common.o \
-			 gfx/drivers_font/gl_raster_font.o \
-			 libretro-common/gfx/math/matrix_4x4.o \
-			 gfx/video_state_tracker.o \
-			 gfx/video_texture.o \
-			 libretro-common/glsym/rglgen.o
+			gfx/video_context_driver.o \
+			gfx/drivers_context/gfx_null_ctx.o \
+			gfx/drivers/gl_common.o \
+			gfx/drivers_font/gl_raster_font.o \
+			libretro-common/gfx/math/matrix_4x4.o \
+			gfx/video_state_tracker.o \
+			gfx/video_texture.o \
+			libretro-common/glsym/rglgen.o
 
    ifeq ($(HAVE_KMS), 1)
       OBJ += gfx/drivers_context/drm_egl_ctx.o
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 60d687b8fb..de6c786254 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -86,16 +86,18 @@ bool menu_display_init(menu_handle_t *menu)
 
 float menu_display_get_dpi(menu_handle_t *menu)
 {
-   float dpi;
+   float dpi = menu_dpi_override_value;
    settings_t *settings = config_get_ptr();
 
    if (!menu || !settings)
-      return menu_dpi_override_value;
+      return dpi;
 
-   if (   settings->menu.dpi.override_enable ||
-         !gfx_ctx_get_metrics(DISPLAY_METRIC_DPI, &dpi)
-      )
-      return settings->menu.dpi.override_value;
+   if (settings->menu.dpi.override_enable)
+      dpi = settings->menu.dpi.override_value;
+#if defined(HAVE_OPENGL) || defined(HAVE_GLES)
+   else if (!gfx_ctx_get_metrics(DISPLAY_METRIC_DPI, &dpi))
+      dpi = menu_dpi_override_value;
+#endif
 
    return dpi;
 }
diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c
index d57123e59c..af32329a2a 100644
--- a/menu/menu_entries_cbs_deferred_push.c
+++ b/menu/menu_entries_cbs_deferred_push.c
@@ -411,6 +411,7 @@ static int deferred_push_system_information(void *data, void *userdata,
          }
       }
 
+#if defined(HAVE_OPENGL) || defined(HAVE_GLES)
       tmp_string = gfx_ctx_get_ident();
 
       snprintf(tmp, sizeof(tmp), "Video context driver: %s",
@@ -444,6 +445,8 @@ static int deferred_push_system_information(void *data, void *userdata,
                   MENU_SETTINGS_CORE_INFO_NONE, 0);
          }
       }
+#endif
+
    }
 
    {