diff --git a/src/scripts.cc b/src/scripts.cc
index b757e19..1a652f1 100644
--- a/src/scripts.cc
+++ b/src/scripts.cc
@@ -32,6 +32,7 @@
 #include "stat.h"
 #include "svga.h"
 #include "tile.h"
+#include "window.h"
 #include "window_manager.h"
 #include "window_manager_private.h"
 #include "worldmap.h"
diff --git a/src/svga.h b/src/svga.h
index c1138d9..1de0d0a 100644
--- a/src/svga.h
+++ b/src/svga.h
@@ -3,10 +3,8 @@
 
 #include <SDL.h>
 
-#include "db.h"
 #include "fps_limiter.h"
 #include "geometry.h"
-#include "window.h"
 
 namespace fallout {
 
diff --git a/src/window.cc b/src/window.cc
index f9beff1..7d776b3 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -6,6 +6,7 @@
 
 #include "color.h"
 #include "datafile.h"
+#include "db.h"
 #include "draw.h"
 #include "game.h"
 #include "input.h"