diff --git a/src/cargo.cpp b/src/cargo.cpp
index dc59fa1..5d07878 100644
--- a/src/cargo.cpp
+++ b/src/cargo.cpp
@@ -17,11 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Starfighter.h"
-
 #include "defs.h"
 #include "structs.h"
 
+#include "alien.h"
+#include "collectable.h"
+#include "gfx.h"
 #include "radio.h"
 
 Object cargo[MAX_CARGO];
diff --git a/src/cutscene.cpp b/src/cutscene.cpp
index 84f9c64..2db0ed3 100644
--- a/src/cutscene.cpp
+++ b/src/cutscene.cpp
@@ -17,11 +17,19 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Starfighter.h"
-
+#include "colors.h"
 #include "defs.h"
 #include "structs.h"
 
+#include "alien.h"
+#include "engine.h"
+#include "explosion.h"
+#include "game.h"
+#include "gfx.h"
+#include "player.h"
+#include "renderer.h"
+#include "screen.h"
+
 typedef struct Message_ {
 
 	int face;
diff --git a/src/engine.cpp b/src/engine.cpp
index a80b9a4..e134246 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -17,15 +17,28 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Starfighter.h"
-
-#include <pwd.h>
-#include <unistd.h>
 #include <errno.h>
+#include <pwd.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
+#include "SDL.h"
+#include "SDL_mixer.h"
+
+#include "colors.h"
 #include "defs.h"
 #include "structs.h"
 
+#include "audio.h"
+#include "collectable.h"
+#include "engine.h"
+#include "game.h"
+#include "gfx.h"
+#include "player.h"
+#include "renderer.h"
+#include "screen.h"
+#include "window.h"
+
 Engine engine;
 
 void engine_init()
diff --git a/src/event.cpp b/src/event.cpp
index f86708d..6d03821 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -17,11 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Starfighter.h"
-
 #include "defs.h"
 #include "structs.h"
 
+#include "alien.h"
+#include "engine.h"
+#include "event.h"
+#include "game.h"
+#include "player.h"
 #include "radio.h"
 
 static Event events[MAX_EVENTS];
diff --git a/src/explosion.cpp b/src/explosion.cpp
index c35eb94..b84aa37 100644
--- a/src/explosion.cpp
+++ b/src/explosion.cpp
@@ -17,11 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Starfighter.h"
-
 #include "defs.h"
 #include "structs.h"
 
+#include "engine.h"
+#include "gfx.h"
+
 /*
 Create a new explosion based on supplied parameters.
 The "type" will actually be used as an explosion frame check.
diff --git a/src/game.cpp b/src/game.cpp
index 64b1248..7a80eab 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -17,12 +17,34 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Starfighter.h"
+#include <math.h>
 
+#include "colors.h"
 #include "defs.h"
 #include "structs.h"
 
+#include "alien.h"
+#include "audio.h"
+#include "bullet.h"
+#include "cargo.h"
+#include "collectable.h"
+#include "cutscene.h"
+#include "engine.h"
+#include "event.h"
+#include "explosion.h"
+#include "game.h"
+#include "gfx.h"
+#include "info.h"
+#include "intermission.h"
+#include "mission.h"
+#include "player.h"
 #include "radio.h"
+#include "renderer.h"
+#include "save.h"
+#include "screen.h"
+#include "ship.h"
+#include "title.h"
+#include "weapons.h"
 
 typedef struct Star_ {
 
diff --git a/src/gfx.cpp b/src/gfx.cpp
index a376479..2d15289 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -19,11 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ctype.h>
 
-#include "Starfighter.h"
+#include "SDL.h"
+#include "SDL_image.h"
 
 #include "defs.h"
 #include "structs.h"
 
+#include "alien.h"
+#include "engine.h"
+#include "game.h"
+#include "screen.h"
+#include "weapons.h"
+
 SDL_Surface *gfx_background;
 SDL_Surface *gfx_sprites[SP_MAX];
 SDL_Surface *gfx_faceSprites[FS_MAX];