diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index f6368705a3..5fc73f6be0 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -42,8 +42,8 @@
 #include "../common/gl_common.h"
 #endif
 
-#include "../common/wayland_common.h"
 #include "../../frontend/frontend_driver.h"
+#include "../../input/common/wayland_common.h"
 #include "../../input/input_driver.h"
 #include "../../input/input_keymaps.h"
 #include "../../verbosity.h"
diff --git a/gfx/common/wayland_common.h b/input/common/wayland_common.h
similarity index 94%
rename from gfx/common/wayland_common.h
rename to input/common/wayland_common.h
index 941da1defa..a496ef9467 100644
--- a/gfx/common/wayland_common.h
+++ b/input/common/wayland_common.h
@@ -13,8 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WAYLAND_COMMON_H__
-#define WAYLAND_COMMON_H__
+#ifndef WAYLAND_INPUT_COMMON_H__
+#define WAYLAND_INPUT_COMMON_H__
 
 #include <stdint.h>
 #include <boolean.h>
@@ -23,7 +23,7 @@
 #include <wayland-client.h>
 #include <wayland-cursor.h>
 
-#include "../../input/input_driver.h"
+#include "../input_driver.h"
 
 #define UDEV_KEY_MAX			0x2ff
 #define UDEV_MAX_KEYS (UDEV_KEY_MAX + 7) / 8
diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c
index fc78b8402c..d4f63fdb99 100644
--- a/input/drivers/wayland_input.c
+++ b/input/drivers/wayland_input.c
@@ -40,8 +40,7 @@
 #include "../input_keymaps.h"
 
 #include "../common/linux_common.h"
-
-#include "../../gfx/common/wayland_common.h"
+#include "../common/wayland_common.h"
 
 #include "../../retroarch.h"
 #include "../../verbosity.h"