--- a/GUI/GUIWindow.h	Mon May 11 09:51:04 2015 +0200
+++ b/GUI/GUIWindow.h	Mon May 11 16:43:46 2015 +0200
@@ -397,33 +397,6 @@
 
     virtual void Update();
 };
-struct GUIWindow_Options : public GUIWindow
-{
-    GUIWindow_Options(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
-        GUIWindow(x, y, width, height, button, hint)
-    {}
-    virtual ~GUIWindow_Options() {}
-
-    virtual void Update();
-};
-struct GUIWindow_KeymappingOptions : public GUIWindow
-{
-    GUIWindow_KeymappingOptions(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
-        GUIWindow(x, y, width, height, button, hint)
-    {}
-    virtual ~GUIWindow_KeymappingOptions() {}
-
-    virtual void Update();
-};
-struct GUIWindow_VideoOptions : public GUIWindow
-{
-    GUIWindow_VideoOptions(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
-        GUIWindow(x, y, width, height, button, hint)
-    {}
-    virtual ~GUIWindow_VideoOptions() {}
-
-    virtual void Update();
-};
 struct GUIWindow_Book : public GUIWindow
 {
     GUIWindow_Book(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
@@ -454,41 +427,6 @@
 
     virtual void Update();
 };
-struct GUIWindow_Rest : public GUIWindow
-{
-    GUIWindow_Rest(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
-        GUIWindow(x, y, width, height, button, hint)
-    {}
-    virtual ~GUIWindow_Rest() {}
-
-    virtual void Update();
-};
-struct GUIWindow_RestWindow : public GUIWindow
-{
-    GUIWindow_RestWindow(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
-        GUIWindow(x, y, width, height, button, hint)
-    {}
-    virtual ~GUIWindow_RestWindow() {}
-
-    virtual void Update();
-    virtual void Release();
-};
-struct GUIWindow_Travel : public GUIWindow
-{
-    GUIWindow_Travel(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint);
-    virtual ~GUIWindow_Travel() {}
-
-    virtual void Update();
-    virtual void Release();
-};
-struct GUIWindow_Transition : public GUIWindow
-{
-    GUIWindow_Transition(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint);
-    virtual ~GUIWindow_Transition() {}
-
-    virtual void Update();
-    virtual void Release();
-};
 struct GUIWindow_Dialogue : public GUIWindow
 {
     GUIWindow_Dialogue(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint);
@@ -819,15 +757,9 @@
 
 // game menu ui
 GUIWindow *GameMenuUI_Load();
-
 GUIWindow *GameMenuUI_Options_Load();
-void GameMenuUI_Options_Draw();
-
 GUIWindow *GameMenuUI_OptionsKeymapping_Load();
-void GameMenuUI_DrawKeyBindings();
-
 GUIWindow *GameMenuUI_OptionsVideo_Load();
-void GameMenuUI_DrawVideoOptions();
 
 
 
@@ -877,16 +809,8 @@
 // rest ui
 void PrepareToLoadRestUI();
 GUIWindow *RestUI_Load();
-void RestUI_Draw();
 
 
-// transition & travel ui
-void TransitionUI_Load(uint32_t anim_id, uint32_t exit_pic_id, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName);
-void TransitionUI_Draw();
-
-void TravelUI_Load();
-void TravelUI_Draw();
-