diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp
index 89267fb01..cc7f79460 100644
--- a/src/gui/workspace/workspace-window.cpp
+++ b/src/gui/workspace/workspace-window.cpp
@@ -22,15 +22,11 @@
 
 #include "gui/gtk-lumiera.hpp"
 #include "gui/config-keys.hpp"
-#include "gui/workspace/ui-manager.hpp"
 #include "workspace-window.hpp"
+#include "gui/workspace/ui-manager.hpp"
+#include "gui/workspace/panel-manager.hpp"
 #include "include/logging.h"
 
-#include <gtkmm/stock.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#endif
 
 
 
diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp
index 54137e5dd..45d09f8b5 100644
--- a/src/gui/workspace/workspace-window.hpp
+++ b/src/gui/workspace/workspace-window.hpp
@@ -32,22 +32,12 @@
 #define GUI_WORKSPACE_WORKSPACE_WINDOW_H
 
 
-#include "gui/workspace/actions.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/workspace/panel-manager.hpp"
 
-#include <gtkmm.h>
-
-using namespace gui::panel;       ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
 namespace gui {
-  namespace model {
-    class Project;
-  }
-  namespace controller {
-    class Controller;
-  }
-  
-  namespace workspace {
+namespace workspace {
   
   class UiManager;