diff --git a/src/audio/alsa.c b/src/audio/alsa.c
index dfbe98e..a1fbc85 100644
--- a/src/audio/alsa.c
+++ b/src/audio/alsa.c
@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <stdio.h>
 #include <opus_multistream.h>
diff --git a/src/audio.h b/src/audio/audio.h
similarity index 100%
rename from src/audio.h
rename to src/audio/audio.h
diff --git a/src/audio/omx.c b/src/audio/omx.c
index 1c21427..dde2e66 100644
--- a/src/audio/omx.c
+++ b/src/audio/omx.c
@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <stdio.h>
 
diff --git a/src/audio/pulse.c b/src/audio/pulse.c
index 9322502..17429cb 100644
--- a/src/audio/pulse.c
+++ b/src/audio/pulse.c
@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/audio/sdl.c b/src/audio/sdl.c
index 35c65ba..f5021af 100644
--- a/src/audio/sdl.c
+++ b/src/audio/sdl.c
@@ -17,7 +17,7 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../audio.h"
+#include "audio.h"
 
 #include <SDL.h>
 #include <SDL_audio.h>
diff --git a/src/config.c b/src/config.c
index e843da8..64ee138 100644
--- a/src/config.c
+++ b/src/config.c
@@ -17,9 +17,10 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input/evdev.h"
 #include "config.h"
-#include "audio.h"
+
+#include "input/evdev.h"
+#include "audio/audio.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/input/x11.c b/src/input/x11.c
index b9a2c57..1e51579 100644
--- a/src/input/x11.c
+++ b/src/input/x11.c
@@ -19,6 +19,7 @@
 
 #include "x11.h"
 #include "keyboard.h"
+
 #include "../loop.h"
 
 #include <Limelight.h>
diff --git a/src/main.c b/src/main.c
index 55a3578..addbcea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,16 +18,15 @@
  */
 
 #include "loop.h"
-#include "client.h"
 #include "connection.h"
 #include "configuration.h"
-#include "audio.h"
-#include "video.h"
-#include "discover.h"
 #include "config.h"
 #include "platform.h"
 #include "sdl.h"
 
+#include "audio/audio.h"
+#include "video/video.h"
+
 #include "input/mapping.h"
 #include "input/evdev.h"
 #include "input/udev.h"
@@ -40,6 +39,9 @@
 
 #include <Limelight.h>
 
+#include <client.h>
+#include <discover.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
diff --git a/src/platform.c b/src/platform.c
index 9441078..404eb7d 100644
--- a/src/platform.c
+++ b/src/platform.c
@@ -20,8 +20,9 @@
 #define _GNU_SOURCE
 
 #include "platform.h"
-#include "audio.h"
-#include "video.h"
+
+#include "audio/audio.h"
+#include "video/video.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/video/imx.c b/src/video/imx.c
index 83979b0..18587c9 100644
--- a/src/video/imx.c
+++ b/src/video/imx.c
@@ -17,9 +17,10 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../loop.h"
 #include "imx_vpu.h"
 
+#include "../loop.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/src/video/pi.c b/src/video/pi.c
index c433e08..8818c34 100644
--- a/src/video/pi.c
+++ b/src/video/pi.c
@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Video decode on Raspberry Pi using OpenMAX IL though the ilcient helper library
 // Based upon video decode example from the Raspberry Pi firmware
 
-#include "sps.h"
-
 #include <Limelight.h>
 
+#include <sps.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/video/sdl.c b/src/video/sdl.c
index 96f1811..c539613 100644
--- a/src/video/sdl.c
+++ b/src/video/sdl.c
@@ -17,10 +17,11 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../video.h"
-#include "../sdl.h"
+#include "video.h"
 #include "ffmpeg.h"
 
+#include "../sdl.h"
+
 #include <SDL.h>
 #include <SDL_thread.h>
 
diff --git a/src/video.h b/src/video/video.h
similarity index 100%
rename from src/video.h
rename to src/video/video.h
diff --git a/src/video/x11.c b/src/video/x11.c
index 3b1c3b0..03de6aa 100644
--- a/src/video/x11.c
+++ b/src/video/x11.c
@@ -17,11 +17,12 @@
  * along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../video.h"
-#include "../input/x11.h"
+#include "video.h"
 #include "egl.h"
 #include "ffmpeg.h"
 
+#include "../input/x11.h"
+
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>