5 files changed, 9 insertions, 5 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index 634451af02..ff574c6179 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -27,6 +27,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/timer.h"
+#include "common/savefile.h"
 #include "common/scaler.h"	// For GFX_NORMAL
 #include "common/system.h"
 #include "sound/mixer.h"
diff --git a/common/system.cpp b/common/system.cpp
index 9198cb564b..28abb27a61 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -29,6 +29,7 @@
 #include "gui/message.h"
 
 #include "common/config-manager.h"
+#include "common/savefile.h"
 #include "common/system.h"
 
 DECLARE_SINGLETON(OSystem);
diff --git a/common/system.h b/common/system.h
index 02f432c98f..7d3a0ea8f7 100644
--- a/common/system.h
+++ b/common/system.h
@@ -24,12 +24,11 @@
 #define COMMON_SYSTEM_H
 
 #include "common/scummsys.h"
-#include "common/util.h"
 #include "common/mutex.h"
 #include "common/rect.h"
-#include "common/savefile.h"
 #include "common/singleton.h"
 
+class SaveFileManager;
 
 /**
  * Interface for ScummVM backends. If you want to port ScummVM to a system
diff --git a/sky/control.cpp b/sky/control.cpp
index fa7361f198..4dfc99c4b5 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -19,10 +19,12 @@
  *
  */
 
+#include "stdafx.h"
+#include "common/config-manager.h"
 #include "common/file.h"
-#include "common/util.h"
 #include "common/system.h"
-#include "common/config-manager.h"
+#include "common/savefile.h"
+#include "common/util.h"
 #include "gui/message.h"
 #include "sky/compact.h"
 #include "sky/control.h"
diff --git a/sword1/control.cpp b/sword1/control.cpp
index 0258e35b34..cd1c664978 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -19,9 +19,10 @@
  *
  */
 
-#include "common/file.h"
 #include "common/stdafx.h"
+#include "common/file.h"
 #include "common/util.h"
+#include "common/savefile.h"
 #include "common/system.h"
 
 #include "gui/message.h"