diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index d48e658949..ca44b9f3a6 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -1846,26 +1846,32 @@ static bool gfx_ctx_wl_bind_api(void *video_driver,
          if ((major * 1000 + minor) >= 3001)
             return false;
 #endif
-         return eglBindAPI(EGL_OPENGL_API);
-#else
-         break;
+#ifdef HAVE_EGL
+         if (eglBindAPI(EGL_OPENGL_API) == EGL_TRUE)
+            return true;
 #endif
+#endif
+         break;
       case GFX_CTX_OPENGL_ES_API:
 #ifdef HAVE_OPENGLES
 #ifndef EGL_KHR_create_context
          if (major >= 3)
             return false;
 #endif
-         return eglBindAPI(EGL_OPENGL_ES_API);
-#else
-         break;
+#ifdef HAVE_EGL
+         if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_TRUE)
+            return true;
 #endif
+#endif
+         break;
       case GFX_CTX_OPENVG_API:
 #ifdef HAVE_VG
-         return eglBindAPI(EGL_OPENVG_API);
-#else
-         break;
+#ifdef HAVE_EGL
+         if (eglBindAPI(EGL_OPENVG_API) == EGL_TRUE)
+            return true;
 #endif
+#endif
+         break;
       case GFX_CTX_VULKAN_API:
 #ifdef HAVE_VULKAN
          return true;
diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c
index f9353feaa1..d9b0194c00 100644
--- a/menu/drivers/ozone/ozone_texture.c
+++ b/menu/drivers/ozone/ozone_texture.c
@@ -25,7 +25,7 @@
 
 #include "../../menu_driver.h"
 
-#include "../../../cheevos/badges.h"
+#include "../../../cheevos-new/badges.h"
 #include "../../../verbosity.h"
 
 menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 05267b15d6..2d5803641e 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -62,7 +62,7 @@
 
 #include "../../tasks/tasks_internal.h"
 
-#include "../../cheevos/badges.h"
+#include "../../cheevos-new/badges.h"
 #include "../../content.h"
 
 #define XMB_RIBBON_ROWS 64