10 files changed, 27 insertions, 27 deletions
diff --git a/src/being.h b/src/being.h
index f55b05f5f..96c547e89 100644
--- a/src/being.h
+++ b/src/being.h
@@ -60,10 +60,11 @@ class ItemInfo;
 class Item;
 class Particle;
 class Party;
-class Position;
 class SpeechBubble;
 class Text;
 
+struct Position;
+
 extern volatile int cur_time;
 
 enum Gender
diff --git a/src/graphics.h b/src/graphics.h
index c1d5aa501..a331c21ba 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -35,7 +35,6 @@
 
 class GraphicsVertexes;
 class Image;
-class ImageRect;
 
 struct SDL_Surface;
 
@@ -59,22 +58,23 @@ static const int defaultScreenHeight = 600;
  * Sections 0, 2, 6 and 8 will remain as is. 1, 3, 4, 5 and 7 will be
  * repeated to fit the size of the widget.
  */
-struct ImageRect
+class ImageRect
 {
-    enum ImagePosition
-    {
-        UPPER_LEFT = 0,
-        UPPER_CENTER = 1,
-        UPPER_RIGHT = 2,
-        LEFT = 3,
-        CENTER = 4,
-        RIGHT = 5,
-        LOWER_LEFT = 6,
-        LOWER_CENTER = 7,
-        LOWER_RIGHT = 8
-    };
-
-    Image *grid[9];
+    public:
+        enum ImagePosition
+        {
+            UPPER_LEFT = 0,
+            UPPER_CENTER = 1,
+            UPPER_RIGHT = 2,
+            LEFT = 3,
+            CENTER = 4,
+            RIGHT = 5,
+            LOWER_LEFT = 6,
+            LOWER_CENTER = 7,
+            LOWER_RIGHT = 8
+        };
+
+        Image *grid[9];
 };
 
 /**
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index ed5a920e7..45ec907fb 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -217,7 +217,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     mDownloadProgress(-1.0f),
     mServers(ServerInfos()),
     mServerInfo(serverInfo),
-    mPersistentIPCheckBox(false)
+    mPersistentIPCheckBox(0)
 {
     if (isSafeMode)
         setCaption("Choose Your Server  *** SAFE MODE ***");
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 51d31f2c9..d3583e0f5 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -54,9 +54,6 @@
 #define SPECIALS_WIDTH 200
 #define SPECIALS_HEIGHT 32
 
-class SpecialEntry;
-
-
 class SpecialEntry : public Container
 {
     public:
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 96ba12dc5..2c7434f40 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -45,7 +45,7 @@ class ScrollArea;
 class Tab;
 class TabbedArea;
 
-struct SpecialEntry;
+class SpecialEntry;
 
 class SpecialsWindow : public Window, public gcn::ActionListener
 {
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 82416b1d9..fa0e3e437 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -485,7 +485,7 @@ void StatusPopup::updateLabels()
     }
     mImitationMode->adjustSize();
 
-    switch (player_node->getAwayMode())
+    switch ((int)player_node->getAwayMode())
     {
         case 0:
             setLabelText(mAwayMode, _("(O) on keyboard"), keyboard.KEY_AWAY);
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 82c97ff43..d2fe19792 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -853,7 +853,7 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent _UNUSED_)
             break;
     }
 
-    switch (player_node->getAwayMode())
+    switch ((int)player_node->getAwayMode())
     {
         case 0:
             str += translateLetter(N_("(O)"));
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index d8db211e7..615e42107 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -36,7 +36,7 @@
 #define _UNUSED_
 #endif
 
-struct LoginData;
+class LoginData;
 
 namespace TmwAthena
 {
diff --git a/src/resources/image.h b/src/resources/image.h
index beaba7b0e..4f59ba1ae 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -43,7 +43,8 @@
 #include <map>
 
 class Dye;
-class Position;
+
+struct Position;
 
 /**
  * Defines a class for loading and storing images.
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 796b77946..572a7704c 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -26,10 +26,11 @@
 #include "utils/xml.h"
 
 class Animation;
-class Frame;
 class Graphics;
 class Image;
 
+struct Frame;
+
 /**
  * This class is a leightweight alternative to the AnimatedSprite class.
  * It hosts a looping animation without actions and directions.