diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 4256ff04e3..0fbd6a11f3 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -18,6 +18,10 @@
 #include "../../msvc/msvc_compat.h"
 #endif
 
+#include "../rarch_console.h"
+
+default_paths_t default_paths;
+
 /*============================================================
 CONSOLE EXTENSIONS
 ============================================================ */
@@ -35,8 +39,6 @@ CONSOLE EXTENSIONS
 
 #include "../rarch_console_sound.c"
 
-#include "../rarch_console.c"
-
 #ifdef HAVE_CONFIGFILE
 #include "../rarch_console_config.c"
 #endif
diff --git a/console/rarch_console.c b/console/rarch_console.c
deleted file mode 100644
index 590d817a6f..0000000000
--- a/console/rarch_console.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2012 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "../boolean.h"
-#include "../compat/strl.h"
-#include "../libretro.h"
-#include "../compat/strl.h"
-#include "../file.h"
-#include "../general.h"
-
-#include "rarch_console.h"
-
-default_paths_t default_paths;
diff --git a/console/rarch_console.h b/console/rarch_console.h
index fd1fee1ca4..203736546e 100644
--- a/console/rarch_console.h
+++ b/console/rarch_console.h
@@ -46,32 +46,34 @@ enum
    MODE_EXIT
 };
 
+#define MAXIMUM_PATH 512
+
 typedef struct
 {
-   char menu_border_file[PATH_MAX];
-   char border_file[PATH_MAX];
-   char border_dir[PATH_MAX];
+   char menu_border_file[MAXIMUM_PATH];
+   char border_file[MAXIMUM_PATH];
+   char border_dir[MAXIMUM_PATH];
 #ifdef HAVE_HDD_CACHE_PARTITION
-   char cache_dir[PATH_MAX];
+   char cache_dir[MAXIMUM_PATH];
 #endif
-   char cgp_dir[PATH_MAX];
-   char config_file[PATH_MAX];
-   char core_dir[PATH_MAX];
-   char executable_extension[PATH_MAX];
-   char filesystem_root_dir[PATH_MAX];
-   char input_presets_dir[PATH_MAX];
+   char cgp_dir[MAXIMUM_PATH];
+   char config_file[MAXIMUM_PATH];
+   char core_dir[MAXIMUM_PATH];
+   char executable_extension[MAXIMUM_PATH];
+   char filesystem_root_dir[MAXIMUM_PATH];
+   char input_presets_dir[MAXIMUM_PATH];
 #ifdef HAVE_MULTIMAN
-   char multiman_self_file[PATH_MAX];
+   char multiman_self_file[MAXIMUM_PATH];
 #endif
-   char port_dir[PATH_MAX];
-   char savestate_dir[PATH_MAX];
+   char port_dir[MAXIMUM_PATH];
+   char savestate_dir[MAXIMUM_PATH];
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
-   char menu_shader_file[PATH_MAX];
-   char shader_file[PATH_MAX];
-   char shader_dir[PATH_MAX];
+   char menu_shader_file[MAXIMUM_PATH];
+   char shader_file[MAXIMUM_PATH];
+   char shader_dir[MAXIMUM_PATH];
 #endif
-   char sram_dir[PATH_MAX];
-   char system_dir[PATH_MAX];
+   char sram_dir[MAXIMUM_PATH];
+   char system_dir[MAXIMUM_PATH];
 } default_paths_t;
 
 extern default_paths_t default_paths;