Cleanup includes

src/drivers/Graphics.cpp

@@ -1,4 +1,5 @@
-#include <os.h>
+#include <cstdlib>
+#include <cstring>
 #include "Graphics.h"
 #include "utility/misc.h"
 

src/drivers/Timers.cpp

@@ -1,4 +1,3 @@
-#include <os.h>
 #include "Timers.h"
 
 #define TIMER 0x900D0000

src/engine/State.h

@@ -1,8 +1,6 @@
 #ifndef INCLUDE_STATE_H
 #define INCLUDE_STATE_H
 
-#include "render/Camera.h"
-
 namespace WalrusRPG
 {
     namespace States

src/engine/StateMachine.cpp

@@ -1,9 +1,9 @@
+#include <libndls.h>
 #include "StateMachine.h"
 #include "drivers/Timers.h"
 #include "drivers/Graphics.h"
 #include "render/Text.h"
 #include "version.h"
-#include <os.h>
 
 using namespace WalrusRPG::Graphics;
 using namespace WalrusRPG::States;

src/engine/main.cpp

@@ -1,11 +1,10 @@
-#include <os.h>
+#include "StateMachine.h"
 #include "drivers/Timers.h"
 #include "drivers/Graphics.h"
-#include "map/Map.h"
-#include "utility/misc.h"
 #include "drivers/Interrupts.h"
+#include "map/Map.h"
 #include "map/StateMap.h"
-#include "StateMachine.h"
+#include "utility/misc.h"
 
 using namespace WalrusRPG;
 

src/map/Entity.cpp

@@ -1,7 +1,6 @@
 #include "Entity.h"
 #include "utility/misc.h"
 #include "utility/Rect.h"
-#include "render/Text.h"
 
 #define ENTITY WalrusRPG::Entity
 using namespace WalrusRPG::Utils;

src/map/Entity.h

@@ -3,7 +3,6 @@
 
 #include "utility/Rect.h"
 #include "render/Camera.h"
-#include "render/Renderer.h"
 #include "render/TileRenderer.h"
 
 namespace WalrusRPG

src/map/Map.cpp

@@ -1,9 +1,8 @@
 #include "Map.h"
-#include "render/Camera.h"
+#include "render/TileRenderer.h"
 #include "drivers/Graphics.h"
-#include <sprites.h>
+#include "sprites.h"
 #include "utility/Rect.h"
-#include "render/TileRenderer.h"
 #include "utility/misc.h"
 
 #define MAP WalrusRPG::Map

src/map/Map.h

@@ -3,7 +3,6 @@
 
 #include <stdint.h>
 #include "render/Camera.h"
-#include "map/Entity.h"
 #include "render/TileRenderer.h"
 #include "render/Animator.h"
 

src/map/StateMap.cpp

@@ -1,6 +1,4 @@
 #include "StateMap.h"
-#include "utility/misc.h"
-#include "version.h"
 #include "drivers/Graphics.h"
 #include "render/Pixel.h"
 #include "render/Text.h"

src/render/Animator.cpp

@@ -1,6 +1,4 @@
 #include "Animator.h"
-#include "drivers/Graphics.h"
-#include "utility/Rect.h"
 
 #define ANIMATOR WalrusRPG::Animator
 

src/render/Animator.h

@@ -3,7 +3,6 @@
 
 #include <TINYSTL/vector.h>
 #include <TINYSTL/unordered_map.h>
-#include "utility/Rect.h"
 
 namespace WalrusRPG
 {

src/render/Camera.cpp

@@ -1,6 +1,5 @@
-#include <os.h>
+#include <libndls.h>
 #include "Camera.h"
-#include "map/Entity.h"
 #include "utility/misc.h"
 
 #define CAMERA WalrusRPG::Camera

src/render/SpriteRenderer.cpp

@@ -1,7 +1,6 @@
+#include <TINYSTL/unordered_map.h>
 #include "SpriteRenderer.h"
 #include "drivers/Graphics.h"
-#include "utility/Rect.h"
-#include <TINYSTL/unordered_map.h>
 
 #define SPRITERENDERER WalrusRPG::SpriteRenderer
 using namespace WalrusRPG;

src/render/Text.cpp

@@ -1,9 +1,8 @@
-#include <sprites.h>
-#include "drivers/Graphics.h"
-#include "Text.h"
 #include <cstdio>
 #include <cstdarg>
-#include <string>
+#include "Text.h"
+#include "sprites.h"
+#include "drivers/Graphics.h"
 
 #define TEXT WalrusRPG::Graphics::Text
 using namespace WalrusRPG::Graphics;

src/render/TileRenderer.cpp

@@ -1,6 +1,5 @@
 #include "TileRenderer.h"
 #include "drivers/Graphics.h"
-#include "utility/Rect.h"
 
 #define TILERENDERER WalrusRPG::TileRenderer
 using namespace WalrusRPG;