WINCE: Enable use of forbidden symbols, cleanup

I tried to untangle the header interdependencies a bit, but this
is still quite a mess.
This commit also fixes some warnings.

svn-id: r53978

9 files changed, 25 insertions, 8 deletions

diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index 23e7843de1..26ec7d93d5 100644
--- a/backends/platform/wince/CEgui/GUIElement.cpp
+++ b/backends/platform/wince/CEgui/GUIElement.cpp
@@ -23,6 +23,11 @@
  *
  */
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include <SDL.h>
+
 #include "Toolbar.h"
 
 #include "SDL_ImageResource.h"
diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h
index 7e4572d377..b8ac3e1a66 100644
--- a/backends/platform/wince/CEgui/GUIElement.h
+++ b/backends/platform/wince/CEgui/GUIElement.h
@@ -29,12 +29,12 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "SDL.h"
-
-#include "SDL_ImageResource.h"
+struct SDL_Surface;
 
 namespace CEGUI {
 
+	class SDL_ImageResource;
+
 	class GUIElement {
 	public:
 		bool setBackground(WORD backgroundReference);
diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp
index 8e0121f7c4..76ea5fbdff 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.cpp
+++ b/backends/platform/wince/CEgui/ItemSwitch.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "ItemSwitch.h"
+#include "SDL_ImageResource.h"
 
 namespace CEGUI {
 
diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h
index 8d03ee77cb..f766612abb 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.h
+++ b/backends/platform/wince/CEgui/ItemSwitch.h
@@ -35,6 +35,7 @@
 using GUI::Key;
 
 namespace CEGUI {
+	class SDL_ImageResource;
 
 	class ItemSwitch : public PanelItem {
 	public:
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp
index 369a75cae1..1e59760e96 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.cpp
+++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp
@@ -23,6 +23,11 @@
  *
  */
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include <SDL.h>
+
 #include "PanelKeyboard.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
index ce6ebd6382..b6cfa0cb1f 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
@@ -23,6 +23,10 @@
  *
  */
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "SDL.h"
 #include "SDL_ImageResource.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h
index 454237dd15..269dfe49ea 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.h
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.h
@@ -29,7 +29,7 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "SDL.h"
+struct SDL_Surface;
 
 namespace CEGUI {
 	class SDL_ImageResource {
diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h
index 3c48e6188a..961aa15200 100644
--- a/backends/platform/wince/CEgui/Toolbar.h
+++ b/backends/platform/wince/CEgui/Toolbar.h
@@ -27,10 +27,6 @@
 #define CEGUI_TOOLBAR_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
-
-//#include "common/map.h"
-#include "common/str.h"
 
 #include "GUIElement.h"
 
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp
index 3f93a4720d..310dd24bfb 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp
@@ -23,6 +23,11 @@
  *
  */
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include <SDL.h>
+
 #include "ToolbarHandler.h"
 
 namespace CEGUI {