diff --git a/src/audio.h b/src/audio.h
index e4f1359..f99d047 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -37,6 +37,3 @@ extern AUDIO_RENDERER_CALLBACKS audio_callbacks_sdl;
 extern AUDIO_RENDERER_CALLBACKS audio_callbacks_pulse;
 bool audio_pulse_init();
 #endif
-#ifdef HAVE_PI
-extern AUDIO_RENDERER_CALLBACKS audio_callbacks_omx;
-#endif
diff --git a/src/platform.c b/src/platform.c
index 58e1332..9441078 100644
--- a/src/platform.c
+++ b/src/platform.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of Moonlight Embedded.
  *
- * Copyright (C) 2015, 2016 Iwan Timmer
+ * Copyright (C) 2015-2017 Iwan Timmer
  *
  * Moonlight is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include "platform.h"
 #include "audio.h"
+#include "video.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/platform.h b/src/platform.h
index 60ffd30..c271834 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of Moonlight Embedded.
  *
- * Copyright (C) 2015, 2016 Iwan Timmer
+ * Copyright (C) 2015-2017 Iwan Timmer
  *
  * Moonlight is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,11 +32,3 @@ enum platform platform_check(char*);
 PDECODER_RENDERER_CALLBACKS platform_get_video(enum platform system);
 PAUDIO_RENDERER_CALLBACKS platform_get_audio(enum platform system);
 bool platform_supports_hevc(enum platform system);
-
-#ifdef HAVE_X11
-extern DECODER_RENDERER_CALLBACKS decoder_callbacks_x11;
-#endif
-#ifdef HAVE_SDL
-extern DECODER_RENDERER_CALLBACKS decoder_callbacks_sdl;
-void sdl_loop();
-#endif
diff --git a/src/video.h b/src/video.h
index f258896..17360d6 100644
--- a/src/video.h
+++ b/src/video.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of Moonlight Embedded.
  *
- * Copyright (C) 2015 Iwan Timmer
+ * Copyright (C) 2015-2017 Iwan Timmer
  *
  * Moonlight is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,5 +17,14 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <Limelight.h>
+
 #define DISPLAY_FULLSCREEN 1
 #define FORCE_HARDWARE_ACCELERATION 2
+
+#ifdef HAVE_X11
+extern DECODER_RENDERER_CALLBACKS decoder_callbacks_x11;
+#endif
+#ifdef HAVE_SDL
+extern DECODER_RENDERER_CALLBACKS decoder_callbacks_sdl;
+#endif
diff --git a/src/video/sdl.c b/src/video/sdl.c
index e9ac2b2..96f1811 100644
--- a/src/video/sdl.c
+++ b/src/video/sdl.c
@@ -21,8 +21,6 @@
 #include "../sdl.h"
 #include "ffmpeg.h"
 
-#include <Limelight.h>
-
 #include <SDL.h>
 #include <SDL_thread.h>
 
diff --git a/src/video/x11.c b/src/video/x11.c
index d1c591e..3b1c3b0 100644
--- a/src/video/x11.c
+++ b/src/video/x11.c
@@ -22,8 +22,6 @@
 #include "egl.h"
 #include "ffmpeg.h"
 
-#include <Limelight.h>
-
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>