diff --git a/Makefile.ngc.salamander b/Makefile.ngc.salamander
index 4a785d911e..5ce4a789a5 100644
--- a/Makefile.ngc.salamander
+++ b/Makefile.ngc.salamander
@@ -37,7 +37,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 LIBS := -lfat -logc
 
-OBJ = frontend/frontend_console.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o ngc/ssaram.o ngc/sidestep.o
+OBJ = frontend/frontend_console.o file_path.o compat/compat.o conf/config_file.o ngc/ssaram.o ngc/sidestep.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 45ea82d806..54f0a090ba 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -19,7 +19,7 @@ endif
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
 PPU_CFLAGS		+= -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
-PPU_SRCS		= frontend/frontend_console.c console/rarch_console_libretro_mgmt.c file_path.c compat/compat.c conf/config_file.c
+PPU_SRCS		= frontend/frontend_console.c file_path.c compat/compat.c conf/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER -Iconsole/logger
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 81fc85db69..a164d48896 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = wii/app_booter
 
-OBJ = frontend/frontend_console.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
+OBJ = frontend/frontend_console.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index 20a0370cd2..31af11efc2 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -19,11 +19,15 @@
 #include <stddef.h>
 #include <string.h>
 
-//optional forward declarations
+//optional RetroArch forward declarations
 static void rarch_console_exec(const char *path);
+
+#ifdef IS_SALAMANDER
+//optional Salamander forward declarations
 static void rarch_manage_libretro_set_first_file(char *first_file,
    size_t size_of_first_file, const char *libretro_path,
    const char * exe_ext);
+#endif
 
 #if defined(__CELLOS_LV2__)
 #include "platform/platform_ps3.c"