10 files changed, 33 insertions, 48 deletions
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index ac3909bb..1bfd14b9 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -24,14 +24,11 @@
 #ifndef _CHAR_SELECT_H
 #define _CHAR_SELECT_H
 
-#include <allegro.h>
-
 #include "../main.h"
 #include "../net/network.h"
 #include "gui.h"
 #include "confirm_dialog.h"
 #include "playerbox.h"
-#include <guichan/allegro.hpp>
 
 /**
  * Character selection dialog.
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index cc1bbe6b..59ba6c69 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -24,17 +24,11 @@
 #ifndef _CHAR_SEL_SERVER_H
 #define _CHAR_SEL_SERVER_H
 
-#ifdef WIN32
-  #pragma warning (disable:4312)
-#endif
-
 #include "../main.h"
 #include "../net/network.h"
 #include "gui.h"
 #include "window.h"
 
-#include <allegro.h>
-
 
 /**
  * The list model for the server list.
diff --git a/src/gui/chat.h b/src/gui/chat.h
index d55ad704..12453971 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -25,7 +25,6 @@
 #define _TMW_CHAT_H
 
 #include <guichan.hpp>
-#include <allegro.h>
 #include <list>
 #include <string>
 #include <fstream>
diff --git a/src/gui/inventory.h b/src/gui/inventory.h
index cedc1697..784918cb 100644
--- a/src/gui/inventory.h
+++ b/src/gui/inventory.h
@@ -24,7 +24,6 @@
 #ifndef _INVENTORY_H
 #define _INVENTORY_H 
 
-#include <allegro.h>
 #include "../log.h"
 #include "../net/network.h"
 #include "../graphic/spriteset.h"
diff --git a/src/gui/login.h b/src/gui/login.h
index b133a2c5..4acec971 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -33,10 +33,6 @@
 #include "../net/network.h"
 #include "gui.h"
 #include "window.h"
-#include <allegro.h>
-#ifdef WIN32
-#include <winalleg.h>
-#endif
 
 extern Configuration config;
 
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index e093efa8..05643f2f 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -24,7 +24,6 @@
 #ifndef __PASSWORDFIELD_H__
 #define __PASSWORDFIELD_H__
 
-#include <allegro.h>
 #include <guichan.hpp>
 #include "textfield.h"
 
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index 47b6f170..65e8ec94 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -24,7 +24,6 @@
 #ifndef __PROGRESSBAR_H__
 #define __PROGRESSBAR_H__
 
-#include <allegro.h>
 #include <guichan.hpp>
 
 /**
@@ -37,7 +36,9 @@ class ProgressBar : public gcn::Widget {
         /**
          * Constructor, initializes the progress with the given value.
          */
-        ProgressBar(float progress = 0.0f, int x = 0, int y = 0, int width = 40, unsigned char red = 150, unsigned green = 150, unsigned char blue = 150);
+        ProgressBar(float progress = 0.0f, int x = 0, int y = 0,
+                int width = 40, unsigned char red = 150, unsigned green = 150,
+                unsigned char blue = 150);
 
         /**
          * Draws the progress bar.
@@ -53,31 +54,38 @@ class ProgressBar : public gcn::Widget {
          * Returns the current progress.
          */
         float getProgress();
-	
-	/**
-	* Change the filling of the progress bar...
-	*/
-	void setColor(unsigned char MyRed, unsigned char MyGreen, unsigned char MyBlue)
-	{
-		Red = MyRed; Green = MyGreen; Blue = MyBlue;
-	}; 
-	
-	int getHeight()
-	{ return 7; };
-	
-	int getWidth()
-	{ return Width; };
-	
-	int getX()
-	{ return X; };
-	
-	int getY()
-	{ return Y; };
+
+        /**
+         * Change the filling of the progress bar...
+         */
+        void setColor(
+                unsigned char MyRed,
+                unsigned char MyGreen,
+                unsigned char MyBlue)
+        {
+            Red = MyRed; Green = MyGreen; Blue = MyBlue;
+        }; 
+
+        int getHeight() {
+            return 7;
+        };
+
+        int getWidth() {
+            return Width;
+        };
+
+        int getX() {
+            return X;
+        };
+
+        int getY() {
+            return Y;
+        };
 
     private:
         float progress;
-	unsigned char Red, Green, Blue;
-	int X, Y, Width;
+        unsigned char Red, Green, Blue;
+        int X, Y, Width;
 };
 
 #endif
diff --git a/src/gui/status.h b/src/gui/status.h
index 1e71dcd1..038d9245 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -21,16 +21,11 @@
  *  $Id$
  */
 
-#ifdef WIN32
-#pragma warning(disable:4312)
-#endif
-
 #ifndef _TMW_STATS_H
 #define _TMW_STATS_H
 
 #include "window.h"
 #include "progressbar.h"
-#include <allegro.h>
 
 /**
  * The player status dialog.
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index e768e91f..34ced06a 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -22,8 +22,7 @@
  */
 
 #include "window.h"
-#include "gui.h"
-#include <guichan/allegro.hpp>
+#include "../graphic/graphic.h"
 #include "../resources/resourcemanager.h"
 
 WindowContainer *Window::windowContainer = NULL;
diff --git a/src/gui/window.h b/src/gui/window.h
index 6802ce2d..65121172 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -25,7 +25,6 @@
 #define _TMW_WINDOW_H__
 
 #include <iostream>
-#include <allegro.h>
 #include <guichan.hpp>
 #include "windowcontainer.h"
 #include "../resources/image.h"