diff --git a/source/gamestate_menu.cpp b/source/gamestate_menu.cpp
index a8e5f57..fa3a87d 100644
--- a/source/gamestate_menu.cpp
+++ b/source/gamestate_menu.cpp
@@ -1,8 +1,5 @@
 #include "gamestates.h"
 #include "jgame.h"
-#include "jdraw.h"
-#include "jaudio.h"
-#include "jinput.h"
 
 namespace gamestate
 {
diff --git a/source/gamestate_prefase.cpp b/source/gamestate_prefase.cpp
index dafc578..210498a 100644
--- a/source/gamestate_prefase.cpp
+++ b/source/gamestate_prefase.cpp
@@ -1,9 +1,5 @@
 #include "gamestates.h"
 #include "jgame.h"
-#include "jdraw.h"
-#include "jaudio.h"
-#include "jinput.h"
-#include "jfile.h"
 #include <string>
 
 namespace gamestate
diff --git a/source/gamestate_sequence.cpp b/source/gamestate_sequence.cpp
index 2f8b68a..414eccf 100644
--- a/source/gamestate_sequence.cpp
+++ b/source/gamestate_sequence.cpp
@@ -1,9 +1,5 @@
 #include "gamestates.h"
 #include "jgame.h"
-#include "jfile.h"
-#include "jinput.h"
-#include "jdraw.h"
-#include "jaudio.h"
 #include <string>
 #include <SDL2/SDL.h>
 
diff --git a/source/jgame.h b/source/jgame.h
index 33a2bd9..2420c86 100644
--- a/source/jgame.h
+++ b/source/jgame.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "jdraw.h"
+#include "jinput.h"
+#include "jaudio.h"
+#include "jfile.h"
 namespace game
 {
     void setUpdateTicks(const int ticks);
diff --git a/source/main.cpp b/source/main.cpp
index 6ffb0b8..41c10e3 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,8 +1,4 @@
 #include "jgame.h"
-#include "jdraw.h"
-#include "jinput.h"
-#include "jaudio.h"
-
 #include "gamestates.h"
 
 void game::init()
@@ -15,13 +11,4 @@ void game::init()
     game::setConfig("fase", -1);
 
     gamestate::sequence::init();
-
-/*
-    draw::surface *pic = draw::loadSurface("sprites.gif");
-    draw::setSource(pic);
-    draw::loadPalette("sprites.gif");
-    draw::draw(0, 0, 320, 200, 0, 0);
-    draw::freeSurface(pic);
-    draw::render();
-*/
 }
\ No newline at end of file