diff --git a/Makefile.common b/Makefile.common
index f61bc30414..7ce6ca314e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -77,7 +77,7 @@ endif
 ifneq ($(findstring Linux,$(OS)),)
    LIBS += -lrt
    OBJ += input/drivers/linuxraw_input.o \
-			 input/drivers/linux_common.o \
+			 input/common/linux_common.o \
           input/drivers_joypad/linuxraw_joypad.o \
           frontend/drivers/platform_linux.o
 endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 1757826230..fae6524804 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -372,7 +372,7 @@ INPUT
 #endif
 
 #if defined(__linux__) && !defined(ANDROID)
-#include "../input/drivers/linux_common.c"
+#include "../input/common/linux_common.c"
 #include "../input/drivers/linuxraw_input.c"
 #include "../input/drivers_joypad/linuxraw_joypad.c"
 #endif
diff --git a/input/drivers/linux_common.c b/input/common/linux_common.c
similarity index 100%
rename from input/drivers/linux_common.c
rename to input/common/linux_common.c
diff --git a/input/drivers/linux_common.h b/input/common/linux_common.h
similarity index 100%
rename from input/drivers/linux_common.h
rename to input/common/linux_common.h
diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c
index 62f2cba4d3..56cf25ad3f 100644
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -25,7 +25,7 @@
 
 #include "../../general.h"
 
-#include "linux_common.h"
+#include "../common/linux_common.h"
 #include "../input_keymaps.h"
 #include "../input_common.h"
 #include "../input_joypad.h"
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 815f966b56..53ee0b4660 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -34,7 +34,7 @@
 
 #include <file/file_path.h>
 
-#include "linux_common.h"
+#include "../common/linux_common.h"
 
 #include "../input_common.h"
 #include "../input_joypad.h"