diff --git a/src/backends/sdl/input.c b/src/backends/sdl/input.c
index 5de226f1..12cffb1f 100644
--- a/src/backends/sdl/input.c
+++ b/src/backends/sdl/input.c
@@ -25,7 +25,6 @@
  * =======================================================================
  */
 
-#include "../../client/refresh/header/local.h"
 #include "../../client/header/keyboard.h"
 #include "../generic/header/input.h"
 #include "../../client/header/client.h"
@@ -83,6 +82,9 @@ cvar_t *m_yaw;
 cvar_t *sensitivity;
 static cvar_t *windowed_mouse;
 
+
+extern void GLimp_GrabInput(qboolean grab);
+
 /* ------------------------------------------------------------------ */
 
 /*
diff --git a/src/backends/sdl/refresh.c b/src/backends/sdl/refresh.c
index a914065c..730223cc 100644
--- a/src/backends/sdl/refresh.c
+++ b/src/backends/sdl/refresh.c
@@ -34,8 +34,8 @@
  * =======================================================================
  */
 
-#include "../../client/refresh/header/local.h"
-
+#include "../../common/header/common.h" /* CVar_*, qboolean (through shared.h) */
+#include "../../client/header/ref.h"
 
 #ifdef SDL2
 #include <SDL2/SDL.h>
diff --git a/src/client/cl_keyboard.c b/src/client/cl_keyboard.c
index c0819246..f72d0a79 100644
--- a/src/client/cl_keyboard.c
+++ b/src/client/cl_keyboard.c
@@ -28,7 +28,6 @@
  */
 
 #include "header/client.h"
-#include "refresh/header/local.h"
 
 static cvar_t *cfg_unbindall;
 
diff --git a/src/client/header/keyboard.h b/src/client/header/keyboard.h
index f91d12a6..c6431c0e 100644
--- a/src/client/header/keyboard.h
+++ b/src/client/header/keyboard.h
@@ -27,6 +27,8 @@
 #ifndef CL_HEADER_KEYBOARD_H
 #define CL_HEADER_KEYBOARD_H
 
+#include "../../common/header/shared.h" /* for qboolean etc */
+
 /* max length of a console command line */
 #define MAXCMDLINE 256
 
diff --git a/src/client/refresh/header/local.h b/src/client/refresh/header/local.h
index d7edb628..3cdcbd2b 100644
--- a/src/client/refresh/header/local.h
+++ b/src/client/refresh/header/local.h
@@ -407,11 +407,6 @@ typedef struct
 extern glconfig_t gl_config;
 extern glstate_t gl_state;
 
-/*
- * Initialzes the SDL video subsystem
- */
-int GLimp_Init(void);
-
 /*
  * Shuts the render context and SDL window down
  * (if contextOnly, the window will not be shutdown)
@@ -424,9 +419,4 @@ void RI_ShutdownWindow(qboolean contextOnly);
  */
 void *GLimp_GetProcAddress (const char* proc);
 
-/*
- * (Un)grab Input
- */
-void GLimp_GrabInput(qboolean grab);
-
 #endif