diff --git a/Makefile.common b/Makefile.common
index a2ca84e312..11cdfcb023 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -907,6 +907,12 @@ ifeq ($(TARGET), retroarch_3ds)
           input/drivers_joypad/ctr_joypad.o
 endif
 
+ifeq ($(TARGET), retroarch_orbis)
+   OBJ +=  input/drivers/ps4_input.o \
+			  input/drivers_joypad/ps4_joypad.o \
+			  audio/drivers/psp_audio.o
+endif
+
 ifeq ($(TARGET), retroarch_switch)
    ifeq ($(HAVE_LIBNX), 1)
       OBJ += menu/drivers_display/menu_display_switch.o \
diff --git a/Makefile.orbis b/Makefile.orbis
index 2b7d5ede2e..23cfe4cd50 100644
--- a/Makefile.orbis
+++ b/Makefile.orbis
@@ -60,11 +60,6 @@ else
 	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += input/drivers/ps4_input.o
-	OBJ += input/drivers_joypad/ps4_joypad.o
-	OBJ += audio/drivers/psp_audio.o
-	#OBJ += frontend/drivers/platform_orbis.o
 endif
 
 ifeq ($(strip $(PS4SDK)),)