diff --git a/src/iconbutton.cpp b/src/iconbutton.cpp
index 515d5c7..83748a9 100644
--- a/src/iconbutton.cpp
+++ b/src/iconbutton.cpp
@@ -1,4 +1,6 @@
 #include "iconbutton.h"
+
+#include "asfont.h"
 #include "gmenu2x.h"
 #include "surface.h"
 
diff --git a/src/iconbutton.h b/src/iconbutton.h
index a7735f5..3adaf8f 100644
--- a/src/iconbutton.h
+++ b/src/iconbutton.h
@@ -2,28 +2,16 @@
 #define ICONBUTTON_H
 
 #include "button.h"
-#include "asfont.h"
 
 #include <string>
 
-using std::string;
-
 class GMenu2X;
 class Surface;
 
 class IconButton : public Button {
-protected:
-	GMenu2X *gmenu2x;
-	string icon, label;
-	void recalcSize();
-	SDL_Rect iconRect, labelRect;
-
-	Surface *iconSurface;
-
-	void updateSurfaces();
-
 public:
-	IconButton(GMenu2X *gmenu2x, const string &icon, const string &label="");
+	IconButton(GMenu2X *gmenu2x, const std::string &icon,
+			const std::string &label="");
 	virtual ~IconButton() {};
 
 	virtual void paint();
@@ -32,6 +20,16 @@ public:
 	virtual void setPosition(int x, int y);
 
 	void setAction(ButtonAction action);
+
+private:
+	void updateSurfaces();
+
+	GMenu2X *gmenu2x;
+	std::string icon, label;
+	void recalcSize();
+	SDL_Rect iconRect, labelRect;
+
+	Surface *iconSurface;
 };
 
 #endif