diff --git a/config.def.h b/config.def.h
index f8083e67a2..5da33a5014 100644
--- a/config.def.h
+++ b/config.def.h
@@ -196,22 +196,6 @@ enum
 #endif
 #endif
 
-#if defined(HAVE_LIBRETRO_MANAGEMENT) || defined(IS_SALAMANDER)
-#ifdef GEKKO
-#define SALAMANDER_FILE "boot.dol"
-#define DEFAULT_EXE_EXT ".dol"
-#elif defined(__CELLOS_LV2__)
-#define SALAMANDER_FILE "EBOOT.BIN"
-#define DEFAULT_EXE_EXT ".SELF"
-#elif defined(_XBOX1)
-#define SALAMANDER_FILE "default.xbe"
-#define DEFAULT_EXE_EXT ".xbe"
-#elif defined(_XBOX360)
-#define SALAMANDER_FILE "default.xex"
-#define DEFAULT_EXE_EXT ".xex"
-#endif
-#endif
-
 ////////////////
 // Video
 ////////////////
diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index 7ae8b91fd3..f532304590 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include "../config.def.h"
+#include "frontend_console.h"
 #include "menu/rmenu.h"
 
 #if defined(__CELLOS_LV2__)
diff --git a/frontend/frontend_console.h b/frontend/frontend_console.h
new file mode 100644
index 0000000000..4675d3a3d8
--- /dev/null
+++ b/frontend/frontend_console.h
@@ -0,0 +1,20 @@
+#ifndef _FRONTEND_CONSOLE_H
+#define _FRONTEND_CONSOLE_H
+
+#if defined(HAVE_LIBRETRO_MANAGEMENT) || defined(IS_SALAMANDER)
+#ifdef GEKKO
+#define SALAMANDER_FILE "boot.dol"
+#define DEFAULT_EXE_EXT ".dol"
+#elif defined(__CELLOS_LV2__)
+#define SALAMANDER_FILE "EBOOT.BIN"
+#define DEFAULT_EXE_EXT ".SELF"
+#elif defined(_XBOX1)
+#define SALAMANDER_FILE "default.xbe"
+#define DEFAULT_EXE_EXT ".xbe"
+#elif defined(_XBOX360)
+#define SALAMANDER_FILE "default.xex"
+#define DEFAULT_EXE_EXT ".xex"
+#endif
+#endif
+
+#endif
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index 79410d58bf..ac5af412f6 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "../config.def.h"
+#include "frontend_console.h"
 #include "frontend_salamander.h"
 
 #if defined(__CELLOS_LV2__)
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index abc04167ea..186d17e766 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -236,10 +236,10 @@ static void get_environment_settings(int argc, char *argv[])
 #elif defined(_XBOX360)
    strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir));
    strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir));
-   strlcpy(g_settings.screenshot_directory, "game:", sizeof(g_settings.screenshot_directory));
 #ifdef IS_SALAMANDER
    strlcpy(default_paths.config_path, "game:\\retroarch.cfg", sizeof(default_paths.config_path));
 #else
+   strlcpy(g_settings.screenshot_directory, "game:", sizeof(g_settings.screenshot_directory));
    strlcpy(g_extern.config_path, "game:\\retroarch.cfg", sizeof(g_extern.config_path));
 #endif
    strlcpy(default_paths.savestate_dir, "game:\\savestates", sizeof(default_paths.savestate_dir));