diff --git a/doc/tutorial/16_movie.cpp b/doc/tutorial/16_movie.cpp
index ab3132f6..c6f1c41a 100644
--- a/doc/tutorial/16_movie.cpp
+++ b/doc/tutorial/16_movie.cpp
@@ -15,6 +15,7 @@
 #endif
 
 #include <lol/engine.h>
+#include <lol/image/movie.h>
 #include "loldebug.h"
 
 int main(int argc, char **argv)
diff --git a/src/image/movie.cpp b/src/image/movie.cpp
index 8ff06aff..afdabf4c 100644
--- a/src/image/movie.cpp
+++ b/src/image/movie.cpp
@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2018 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -11,6 +11,7 @@
 //
 
 #include <lol/engine-internal.h>
+#include <lol/image/movie.h>
 
 #if LOL_USE_FFMPEG
 extern "C"
diff --git a/src/lol/extras.h b/src/lol/extras.h
index 7258d822..9d684f44 100644
--- a/src/lol/extras.h
+++ b/src/lol/extras.h
@@ -41,8 +41,6 @@
 #include <lol/../gradient.h>
 #include <lol/../sprite.h>
 #include <lol/../text.h>
-#include <lol/../textureimage.h>
-#include <lol/../tileset.h>
 
 // UI
 #include <lol/../ui/input.h>
diff --git a/src/lol/image/all.h b/src/lol/image/all.h
index 3375d56c..75f474cf 100644
--- a/src/lol/image/all.h
+++ b/src/lol/image/all.h
@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2015 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -13,8 +13,5 @@
 #pragma once
 
 #include <lol/image/pixel.h>
-#include <lol/image/color.h>
-#include <lol/image/image.h>
 #include <lol/image/resource.h>
-#include <lol/image/movie.h>
 
diff --git a/src/scene.h b/src/scene.h
index e870e9bb..9b1b83b4 100644
--- a/src/scene.h
+++ b/src/scene.h
@@ -21,7 +21,6 @@
 #include <memory>
 #include <stdint.h>
 
-#include "tileset.h"
 #include "light.h"
 #include "camera.h"
 #include "mesh/mesh.h"
@@ -55,7 +54,7 @@ private:
 struct Tile
 {
     mat4 m_model;
-    TileSet *m_tileset;
+    class TileSet *m_tileset;
     int m_id;
 };
 
@@ -241,8 +240,8 @@ public:
 
     /* FIXME: this should be deprecated -- it doesn't really match
      * the architecture we want to build */
-    void AddTile(TileSet *tileset, int id, vec3 pos, vec2 scale, float radians);
-    void AddTile(TileSet *tileset, int id, mat4 model);
+    void AddTile(class TileSet *tileset, int id, vec3 pos, vec2 scale, float radians);
+    void AddTile(class TileSet *tileset, int id, mat4 model);
 
 public:
     void AddLine(vec3 a, vec3 b, vec4 color);