diff --git a/desktop_version/src/Ent.cpp b/desktop_version/src/Ent.cpp
index a2dcb84e..a4566a09 100644
--- a/desktop_version/src/Ent.cpp
+++ b/desktop_version/src/Ent.cpp
@@ -1,5 +1,8 @@
 #include "Ent.h"
 
+#include "Game.h"
+#include "Graphics.h"
+
 entclass::entclass()
 {
 	invis = false;
diff --git a/desktop_version/src/Ent.h b/desktop_version/src/Ent.h
index 3007ccf2..87dd9817 100644
--- a/desktop_version/src/Ent.h
+++ b/desktop_version/src/Ent.h
@@ -1,7 +1,7 @@
 #ifndef ENT_H
 #define ENT_H
 
-#include "Graphics.h"
+#include <SDL.h>
 
 #define		rn( rx,  ry) ((rx) + ((ry) * 100))
 
diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 60441c6a..ca7f802e 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -1,6 +1,10 @@
 #include "Entity.h"
+
+#include "editor.h"
 #include "Game.h"
+#include "Graphics.h"
 #include "Map.h"
+#include "Music.h"
 #include "UtilityClass.h"
 
 bool entityclass::checktowerspikes(int t)
diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h
index 8702e000..005a3276 100644
--- a/desktop_version/src/Entity.h
+++ b/desktop_version/src/Entity.h
@@ -4,6 +4,7 @@
 #include "Maths.h"
 #include "Ent.h"
 #include "BlockV.h"
+#include "Game.h"
 
 #include <vector>
 #include <string>
diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp
index a64038eb..252e87bc 100644
--- a/desktop_version/src/FileSystemUtils.cpp
+++ b/desktop_version/src/FileSystemUtils.cpp
@@ -1,5 +1,3 @@
-#include "FileSystemUtils.h"
-
 #include <vector>
 #include <string>
 
@@ -8,6 +6,7 @@
 #include <string.h>
 
 #include "Graphics.h"
+#include "UtilityClass.h"
 
 #include <iterator>
 #include <algorithm>
@@ -231,6 +230,8 @@ void FILESYSTEM_unmountassets()
 	FILESYSTEM_assetsmounted = false;
 }
 
+void FILESYSTEM_freeMemory(unsigned char **mem);
+
 void FILESYSTEM_loadFileToMemory(
 	const char *name,
 	unsigned char **mem,
diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp
index 4670d569..a1d552b3 100644
--- a/desktop_version/src/Finalclass.cpp
+++ b/desktop_version/src/Finalclass.cpp
@@ -2,6 +2,10 @@
 
 #include "MakeAndPlay.h"
 
+#include "Game.h"
+#include "Entity.h"
+#include "UtilityClass.h"
+
 const short* finalclass::loadlevel(int rx, int ry)
 {
 	int t;
diff --git a/desktop_version/src/Finalclass.h b/desktop_version/src/Finalclass.h
index 011594c1..eb0572b7 100644
--- a/desktop_version/src/Finalclass.h
+++ b/desktop_version/src/Finalclass.h
@@ -1,9 +1,6 @@
 #ifndef FINALCLASS_H
 #define FINALCLASS_H
 
-#include "Game.h"
-#include "Entity.h"
-
 #include <string>
 
 class finalclass
diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index ed696b6c..8e98eb27 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -1,10 +1,13 @@
 #include "Enums.h"
 
+#include "editor.h"
 #include "Game.h"
 #include "Graphics.h"
 #include "Entity.h"
 #include "Map.h"
+#include "Music.h"
 #include "Script.h"
+#include "UtilityClass.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index 17f906ba..f1e696aa 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -4,9 +4,6 @@
 #include <vector>
 #include <string>
 #include <SDL.h>
-#include "Maths.h"
-#include "UtilityClass.h"
-#include "GraphicsUtil.h"
 
 struct MenuOption
 {
diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 25f1b1ae..209b4123 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -1,9 +1,11 @@
 #include "Graphics.h"
-#include "Maths.h"
+#include "editor.h"
 #include "Entity.h"
 #include "Map.h"
+#include "Music.h"
 #include "Screen.h"
 #include "FileSystemUtils.h"
+#include "UtilityClass.h"
 #include <utf8/unchecked.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h
index da9e6498..df76e1fa 100644
--- a/desktop_version/src/Graphics.h
+++ b/desktop_version/src/Graphics.h
@@ -9,8 +9,6 @@
 
 #include "Maths.h"
 #include "Textbox.h"
-#include "UtilityClass.h"
-#include "Game.h"
 
 
 #include <string>
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index c0383f21..c9a921df 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1,4 +1,3 @@
-#include "Input.h"
 #include "Logic.h"
 #include "Script.h"
 #include "Credits.h"
@@ -9,6 +8,15 @@
 
 #include "FileSystemUtils.h"
 
+#include "editor.h"
+#include "Entity.h"
+#include "Enums.h"
+#include "Game.h"
+#include "Graphics.h"
+#include "KeyPoll.h"
+#include "Map.h"
+#include "Music.h"
+
 void updatebuttonmappings(int bind)
 {
     for (
diff --git a/desktop_version/src/Input.h b/desktop_version/src/Input.h
index a83f4d1a..3f2c7acf 100644
--- a/desktop_version/src/Input.h
+++ b/desktop_version/src/Input.h
@@ -1,14 +1,6 @@
 #ifndef INPUT_H
 #define INPUT_H
 
-#include "KeyPoll.h"
-#include "Graphics.h"
-#include "Game.h"
-#include "Entity.h"
-#include "UtilityClass.h"
-#include "Music.h"
-#include "Map.h"
-
 void titleinput();
 
 void gameinput();
diff --git a/desktop_version/src/KeyPoll.cpp b/desktop_version/src/KeyPoll.cpp
index 0c851c6c..a283b613 100644
--- a/desktop_version/src/KeyPoll.cpp
+++ b/desktop_version/src/KeyPoll.cpp
@@ -1,4 +1,5 @@
 #include "KeyPoll.h"
+#include "Game.h"
 #include "Graphics.h"
 #include "Music.h"
 #include <stdio.h>
diff --git a/desktop_version/src/KeyPoll.h b/desktop_version/src/KeyPoll.h
index 839df273..e7d40f83 100644
--- a/desktop_version/src/KeyPoll.h
+++ b/desktop_version/src/KeyPoll.h
@@ -7,8 +7,6 @@
 
 #include <SDL.h>
 
-#include "Screen.h"
-
 enum Kybrd
 {
 	KEYBOARD_UP = SDLK_UP,
diff --git a/desktop_version/src/Labclass.cpp b/desktop_version/src/Labclass.cpp
index 78500293..9804855e 100644
--- a/desktop_version/src/Labclass.cpp
+++ b/desktop_version/src/Labclass.cpp
@@ -2,6 +2,10 @@
 
 #include "MakeAndPlay.h"
 
+#include "Game.h"
+#include "Entity.h"
+#include "UtilityClass.h"
+
 const short* labclass::loadlevel(int rx, int ry)
 {
 	int t;
diff --git a/desktop_version/src/Labclass.h b/desktop_version/src/Labclass.h
index 4f4df573..6c9e72de 100644
--- a/desktop_version/src/Labclass.h
+++ b/desktop_version/src/Labclass.h
@@ -1,9 +1,6 @@
 #ifndef LABCLASS_H
 #define LABCLASS_H
 
-#include "Game.h"
-#include "Entity.h"
-
 #include <string>
 
 class labclass
diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 1d4fdac5..e0ee9149 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -1,9 +1,17 @@
-#include "Logic.h"
 #include "Script.h"
 #include "Network.h"
 #include "FileSystemUtils.h"
 #include "Credits.h"
 
+#include "editor.h"
+#include "Entity.h"
+#include "Enums.h"
+#include "Game.h"
+#include "Graphics.h"
+#include "Map.h"
+#include "Music.h"
+#include "UtilityClass.h"
+
 void titleupdatetextcol()
 {
     graphics.col_tr = map.r - (help.glow / 4) - int(fRandom() * 4);
diff --git a/desktop_version/src/Logic.h b/desktop_version/src/Logic.h
index 2c90b3fb..fba5af72 100644
--- a/desktop_version/src/Logic.h
+++ b/desktop_version/src/Logic.h
@@ -1,13 +1,6 @@
 #ifndef LOGIC_H
 #define LOGIC_H
 
-#include "Graphics.h"
-#include "Game.h"
-#include "Entity.h"
-#include "UtilityClass.h"
-#include "Music.h"
-#include "Map.h"
-
 void titleupdatetextcol();
 
 void titlelogic();
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 3de1efca..f95cafff 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -3,6 +3,13 @@
 
 #include "MakeAndPlay.h"
 
+#include "editor.h"
+#include "Entity.h"
+#include "Game.h"
+#include "Graphics.h"
+#include "Music.h"
+#include "UtilityClass.h"
+
 mapclass::mapclass()
 {
 	//Start here!
diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h
index 2ec064bb..1c91586f 100644
--- a/desktop_version/src/Map.h
+++ b/desktop_version/src/Map.h
@@ -7,11 +7,9 @@
 #include "Labclass.h"
 #include "Spacestation2.h"
 #include "Otherlevel.h"
-#include "Entity.h"
-#include "Graphics.h"
 #include <vector>
-#include "Music.h"
-#include "editor.h"
+
+#include "Maths.h"
 
 struct Roomtext
 {
diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index 63aff02d..d9f34f11 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -3,6 +3,7 @@
 #include "Music.h"
 #include "BinaryBlob.h"
 #include "Map.h"
+#include "UtilityClass.h"
 
 void songend();
 
diff --git a/desktop_version/src/Network.c b/desktop_version/src/Network.c
index 6c84bf00..15937a81 100644
--- a/desktop_version/src/Network.c
+++ b/desktop_version/src/Network.c
@@ -1,4 +1,4 @@
-#include "Network.h"
+#include <stdint.h>
 
 #define UNUSED(expr) (void)(expr)
 
diff --git a/desktop_version/src/Otherlevel.cpp b/desktop_version/src/Otherlevel.cpp
index 6e711c77..363588e5 100644
--- a/desktop_version/src/Otherlevel.cpp
+++ b/desktop_version/src/Otherlevel.cpp
@@ -2,6 +2,9 @@
 
 #include "MakeAndPlay.h"
 
+#include "Game.h"
+#include "Entity.h"
+
 const short* otherlevelclass::loadlevel(int rx, int ry)
 {
 	int t;
diff --git a/desktop_version/src/Otherlevel.h b/desktop_version/src/Otherlevel.h
index 7c852eb5..381111a4 100644
--- a/desktop_version/src/Otherlevel.h
+++ b/desktop_version/src/Otherlevel.h
@@ -1,9 +1,6 @@
 #ifndef OTHERLEVEL_H
 #define OTHERLEVEL_H
 
-#include "Game.h"
-#include "Entity.h"
-
 #include <string>
 
 class otherlevelclass
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 727b2be0..d045d11a 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -1,10 +1,10 @@
-#include "Render.h"
-
+#include "editor.h"
 #include "Graphics.h"
 #include "UtilityClass.h"
 #include "Maths.h"
 #include "Entity.h"
 #include "Map.h"
+#include "Music.h"
 #include "Script.h"
 #include "FileSystemUtils.h"
 #include "Credits.h"
diff --git a/desktop_version/src/Render.h b/desktop_version/src/Render.h
index 336235ab..561ae6a5 100644
--- a/desktop_version/src/Render.h
+++ b/desktop_version/src/Render.h
@@ -1,13 +1,6 @@
 #ifndef RENDER_H
 #define RENDER_H
 
-#include "Graphics.h"
-#include "UtilityClass.h"
-#include "Maths.h"
-#include "Entity.h"
-#include "Map.h"
-#include "Script.h"
-
 void titlerender();
 
 void gamerender();
diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index 15058bf6..e33e1fe5 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -1,10 +1,13 @@
 #include "Script.h"
 #include "Graphics.h"
 
+#include "editor.h"
 #include "Entity.h"
+#include "Enums.h"
 #include "Music.h"
 #include "KeyPoll.h"
 #include "Map.h"
+#include "UtilityClass.h"
 
 scriptclass::scriptclass()
 {
diff --git a/desktop_version/src/Script.h b/desktop_version/src/Script.h
index ea32c74b..7af1c8e8 100644
--- a/desktop_version/src/Script.h
+++ b/desktop_version/src/Script.h
@@ -4,8 +4,6 @@
 #include <string>
 #include <vector>
 
-#include "Enums.h"
-
 #define filllines(lines) commands.insert(commands.end(), lines, lines + sizeof(lines)/sizeof(lines[0]))
 
 
diff --git a/desktop_version/src/Spacestation2.cpp b/desktop_version/src/Spacestation2.cpp
index bf31eb5c..c8126982 100644
--- a/desktop_version/src/Spacestation2.cpp
+++ b/desktop_version/src/Spacestation2.cpp
@@ -2,6 +2,10 @@
 
 #include "MakeAndPlay.h"
 
+#include "Game.h"
+#include "Entity.h"
+#include "UtilityClass.h"
+
 const short* spacestation2class::loadlevel(int rx, int ry)
 {
 	int t;
diff --git a/desktop_version/src/Spacestation2.h b/desktop_version/src/Spacestation2.h
index d16d55ed..6414eb3f 100644
--- a/desktop_version/src/Spacestation2.h
+++ b/desktop_version/src/Spacestation2.h
@@ -1,9 +1,6 @@
 #ifndef SPACESTATION2_H
 #define SPACESTATION2_H
 
-#include "Game.h"
-#include "Entity.h"
-
 #include <string>
 
 class spacestation2class
diff --git a/desktop_version/src/WarpClass.cpp b/desktop_version/src/WarpClass.cpp
index b6b61ae1..3f14cc81 100644
--- a/desktop_version/src/WarpClass.cpp
+++ b/desktop_version/src/WarpClass.cpp
@@ -2,6 +2,10 @@
 
 #include "MakeAndPlay.h"
 
+#include "Game.h"
+#include "Entity.h"
+#include "UtilityClass.h"
+
 const short* warpclass::loadlevel(int rx, int ry)
 {
 	int t;
diff --git a/desktop_version/src/WarpClass.h b/desktop_version/src/WarpClass.h
index da654f50..7b84cb34 100644
--- a/desktop_version/src/WarpClass.h
+++ b/desktop_version/src/WarpClass.h
@@ -1,9 +1,6 @@
 #ifndef WARPCLASS_H
 #define WARPCLASS_H
 
-#include "Game.h"
-#include "Entity.h"
-
 #include <string>
 
 class warpclass
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 08261d57..369a8ebe 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -8,6 +8,7 @@
 #include "KeyPoll.h"
 #include "Map.h"
 #include "Script.h"
+#include "UtilityClass.h"
 #include "time.h"
 
 #include <tinyxml2.h>
diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h
index f9a33970..072e9b80 100644
--- a/desktop_version/src/editor.h
+++ b/desktop_version/src/editor.h
@@ -5,8 +5,8 @@
 
 #include <vector>
 #include <string>
-#include "Script.h"
-#include "Graphics.h"
+
+#include <SDL.h>
 
 // Text entry field type
 enum textmode {
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index d2a16c36..414981c1 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -2,6 +2,8 @@
 #include "SoundSystem.h"
 
 #include "UtilityClass.h"
+#include "Enums.h"
+#include "Entity.h"
 #include "Game.h"
 #include "Graphics.h"
 #include "KeyPoll.h"
@@ -12,6 +14,7 @@
 #include "Labclass.h"
 #include "Finalclass.h"
 #include "Map.h"
+#include "Music.h"
 
 #include "Screen.h"
 
diff --git a/desktop_version/src/preloader.cpp b/desktop_version/src/preloader.cpp
index dc0a62c3..5cca49f8 100644
--- a/desktop_version/src/preloader.cpp
+++ b/desktop_version/src/preloader.cpp
@@ -1,6 +1,9 @@
 #include "preloader.h"
 
 #include "Enums.h"
+#include "Game.h"
+#include "Graphics.h"
+#include "UtilityClass.h"
 
 int pre_fakepercent=0, pre_transition=30;
 bool pre_startgame=false;
diff --git a/desktop_version/src/preloader.h b/desktop_version/src/preloader.h
index 8f780604..de4cf52d 100644
--- a/desktop_version/src/preloader.h
+++ b/desktop_version/src/preloader.h
@@ -1,10 +1,6 @@
 #ifndef PRELOADER_H
 #define PRELOADER_H
 
-#include "Graphics.h"
-#include "Game.h"
-#include "UtilityClass.h"
-
 void preloaderrender();
 
 void preloaderlogic();