From 22923180269f9356e06f8f8517c8128279d820e9 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Thu, 19 Jul 2012 19:40:18 +0200
Subject: WINTERMUTE: Cleanup some includes in persistency related classes.

---
 engines/wintermute/persistent.cpp              | 1 +
 engines/wintermute/persistent.h                | 3 ---
 engines/wintermute/system/SysClassRegistry.cpp | 1 +
 engines/wintermute/system/SysClassRegistry.h   | 1 +
 engines/wintermute/wintypes.h                  | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp
index fb00419100..10c2132326 100644
--- a/engines/wintermute/persistent.cpp
+++ b/engines/wintermute/persistent.cpp
@@ -86,6 +86,7 @@
 #include "engines/wintermute/ui/UITiledImage.h"
 #include "engines/wintermute/ui/UIWindow.h"
 #include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/system/SysClass.h"
 
 // CSysClass adds these objects to the registry, thus they aren't as leaked as they look
 #define REGISTER_CLASS(class_name, persistent_class)\
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index 556ccbbd4f..a7d028b911 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -29,8 +29,6 @@
 #ifndef WINTERMUTE_PERSISTENT_H
 #define WINTERMUTE_PERSISTENT_H
 
-#include "engines/wintermute/wintypes.h"
-
 namespace WinterMute {
 
 class CBPersistMgr;
@@ -41,7 +39,6 @@ typedef bool(*PERSISTLOAD)(void *, CBPersistMgr *);
 typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data);
 } // end of namespace WinterMute
 
-#include "engines/wintermute/system/SysClass.h"
 #include "engines/wintermute/system/SysClassRegistry.h"
 namespace WinterMute {
 
diff --git a/engines/wintermute/system/SysClassRegistry.cpp b/engines/wintermute/system/SysClassRegistry.cpp
index 0b173c3afb..4cc0f4508a 100644
--- a/engines/wintermute/system/SysClassRegistry.cpp
+++ b/engines/wintermute/system/SysClassRegistry.cpp
@@ -31,6 +31,7 @@
 #include "engines/wintermute/wintermute.h"
 #include "SysInstance.h"
 #include "SysClassRegistry.h"
+#include "engines/wintermute/system/SysClass.h"
 #include "common/stream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/system/SysClassRegistry.h b/engines/wintermute/system/SysClassRegistry.h
index a4a410527d..c9c4e8c072 100644
--- a/engines/wintermute/system/SysClassRegistry.h
+++ b/engines/wintermute/system/SysClassRegistry.h
@@ -32,6 +32,7 @@
 #include "engines/wintermute/wintypes.h"
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/persistent.h"
+#include "engines/wintermute/system/SysClass.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "common/func.h"
diff --git a/engines/wintermute/wintypes.h b/engines/wintermute/wintypes.h
index 04a657c644..8db55e2a37 100644
--- a/engines/wintermute/wintypes.h
+++ b/engines/wintermute/wintypes.h
@@ -30,7 +30,6 @@
 #define WINTERMUTE_WINTYPES_H
 
 #include "common/scummsys.h"
-#include "common/rect.h"
 
 namespace WinterMute {
 
-- 
cgit v1.2.3