diff --git a/Makefile.common b/Makefile.common
index 6293255e73..590d463b70 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -987,7 +987,7 @@ ifeq ($(HAVE_NETWORKING), 1)
    endif
 
    ifeq ($(HAVE_NETWORK_GAMEPAD), 1)
-      OBJ += remote.o
+      OBJ += input/input_remote.o
    endif
 endif
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 9aa38f3899..88d7530623 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -914,7 +914,7 @@ MENU
 #endif
 
 #ifdef HAVE_NETWORK_GAMEPAD
-#include "../remote.c"
+#include "../input/input_remote.c"
 #endif
 
 #include "../command_event.c"
diff --git a/input/input_driver.c b/input/input_driver.c
index ac6284c62a..58779019d9 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_NETWORK_GAMEPAD
-#include "../remote.h"
+#include "input_remote.h"
 #endif
 
 static const input_driver_t *input_drivers[] = {
diff --git a/remote.c b/input/input_remote.c
similarity index 99%
rename from remote.c
rename to input/input_remote.c
index 6c5c021b6d..2f20c0d8db 100644
--- a/remote.c
+++ b/input/input_remote.c
@@ -29,7 +29,7 @@
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 
-#include "remote.h"
+#include "input_remote.h"
 
 #include "msg_hash.h"
 #include "runloop.h"
diff --git a/remote.h b/input/input_remote.h
similarity index 100%
rename from remote.h
rename to input/input_remote.h