diff --git a/console/console_ext.h b/console/console_ext.h
index 447c1d4820..dca068c17d 100644
--- a/console/console_ext.h
+++ b/console/console_ext.h
@@ -17,6 +17,10 @@
 #ifndef CONSOLE_EXT_H__
 #define CONSOLE_EXT_H__
 
+#ifdef HAVE_LIBRETRO_MANAGEMENT
+#include "libretro_mgmt.h"
+#endif
+
 #define IS_TIMER_NOT_EXPIRED(handle) (handle->frame_count < g_console.timer_expiration_frame_count)
 #define IS_TIMER_EXPIRED(handle) 	(!(IS_TIMER_NOT_EXPIRED(handle)))
 #define SET_TIMER_EXPIRATION(handle, value) (g_console.timer_expiration_frame_count = handle->frame_count + value)
@@ -100,14 +104,6 @@ void rarch_input_set_default_keybind_names_for_emulator(void);
 
 void rarch_input_set_keybind(unsigned player, unsigned keybind_action, uint64_t default_retro_joypad_id);
 
-#ifdef HAVE_LIBRETRO_MANAGEMENT
-/*============================================================
-	LIBRETRO MANAGEMENT
-============================================================ */
-
-bool rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext);
-void rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext);
-#endif
 
 /*============================================================
   RetroArch
diff --git a/console/libretro_mgmt.c b/console/libretro_mgmt.c
index bc7e4d62b8..48fdca8f36 100644
--- a/console/libretro_mgmt.c
+++ b/console/libretro_mgmt.c
@@ -33,11 +33,7 @@ bool rarch_manage_libretro_install(const char *full_path, const char *path, cons
       // a new libretro port and therefore we need to change it to a more
       // sane name.
 
-#if defined(__CELLOS_LV2__)
-      CellFsErrno ret;
-#else
       int ret;
-#endif
 
       rarch_console_name_from_id(tmp_path2, sizeof(tmp_path2));
       strlcat(tmp_path2, exe_ext, sizeof(tmp_path2));
diff --git a/console/libretro_mgmt.h b/console/libretro_mgmt.h
new file mode 100644
index 0000000000..4074af6b68
--- /dev/null
+++ b/console/libretro_mgmt.h
@@ -0,0 +1,25 @@
+/*  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/>.
+ */
+
+#ifndef LIBRETRO_MGMT_H__
+#define LIBRETRO_MGMT_H__
+
+#include "../boolean.h"
+
+bool rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext);
+void rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext);
+
+#endif