diff --git a/src/core_lua.c b/src/core_lua.c
index d7b1dfe62dcf345e82fe50e37ad9d1bad4bc617e..4d05a549799f0b9b9b73b58fd63277bf58de2de0 100644
--- a/src/core_lua.c
+++ b/src/core_lua.c
@@ -18,6 +18,7 @@
     Nicolas Casalini "DarkGod"
     darkgod@te4.org
 */
+#include "display.h"
 #include "fov/fov.h"
 #include "lua.h"
 #include "lauxlib.h"
@@ -31,7 +32,6 @@
 #include "SFMT.h"
 #include "mzip.h"
 #include "main.h"
-#include "tSDL.h"
 #include <math.h>
 #include <time.h>
 
diff --git a/src/main.c b/src/main.c
index 08f5017cd083e45b59cc80f937100fd3b779b66f..c1b418b44c4bf77a7d7525f6f2dcd4923c6232a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/time.h>
-#include "tSDL.h"
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
diff --git a/src/map.c b/src/map.c
index 22495ef37fe7e26fbb586b937a21385e8d1d367b..1ddab99f2923b1d192b7633fe2bd4e387a75472f 100644
--- a/src/map.c
+++ b/src/map.c
@@ -18,6 +18,7 @@
     Nicolas Casalini "DarkGod"
     darkgod@te4.org
 */
+#include "display.h"
 #include <math.h>
 #include "lua.h"
 #include "lauxlib.h"
@@ -26,7 +27,6 @@
 #include "types.h"
 #include "map.h"
 #include "script.h"
-#include "tSDL.h"
 //#include "shaders.h"
 
 extern void useShader(GLuint p, int x, int y, float a);
diff --git a/src/music.c b/src/music.c
index 5592aac643be88ce9e465590ee8f8bccb60716ff..9b504890fb91884f1104109d563741fd7052c922 100644
--- a/src/music.c
+++ b/src/music.c
@@ -18,6 +18,7 @@
     Nicolas Casalini "DarkGod"
     darkgod@te4.org
 */
+#include "display.h"
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
@@ -25,7 +26,6 @@
 #include "types.h"
 #include "music.h"
 #include "script.h"
-#include "tSDL.h"
 #include "physfs.h"
 #include "physfsrwops.h"
 
diff --git a/src/noise.c b/src/noise.c
index 6c37d4130e16e56ec1a69ebf0eaf4a0c62592778..ca2c189b6c1da660eff1d7c43a84025bcb309ebf 100644
--- a/src/noise.c
+++ b/src/noise.c
@@ -18,6 +18,7 @@
     Nicolas Casalini "DarkGod"
     darkgod@te4.org
 */
+#include "display.h"
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
@@ -28,7 +29,6 @@
 #include <stdlib.h>
 #include "libtcod.h"
 #include "noise.h"
-#include "tgl.h"
 
 typedef struct
 {
diff --git a/src/particles.c b/src/particles.c
index c5b84d19258ea549606126bd00adf97371cbbf0f..665759832eb7387194c5d177b864d987251fca0f 100644
--- a/src/particles.c
+++ b/src/particles.c
@@ -18,6 +18,7 @@
     Nicolas Casalini "DarkGod"
     darkgod@te4.org
 */
+#include "display.h"
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
@@ -26,7 +27,6 @@
 #include "particles.h"
 #include "script.h"
 #include <math.h>
-#include "tSDL.h"
 #include "SFMT.h"
 
 #define rng(x, y) (x + rand_div(1 + y - x))
diff --git a/src/shaders.c b/src/shaders.c
index 3387a39b7fa5429672b8ec108c20ee4ef5f8c483..ea550bbb85f9f0084e35d29fce4de333e5624e77 100644
--- a/src/shaders.c
+++ b/src/shaders.c
@@ -18,6 +18,7 @@
     Nicolas Casalini "DarkGod"
     darkgod@te4.org
 */
+#include "display.h"
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
@@ -25,8 +26,6 @@
 #include "types.h"
 #include "music.h"
 #include "script.h"
-#include "tSDL.h"
-#include "tgl.h"
 #include "shaders.h"
 #include "libtcod.h"