2 files changed, 9 insertions, 7 deletions
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index c720730aa..830b52f1d 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -54,15 +54,10 @@ namespace KWinInternal
 {
 
 extern int screen_number;
+extern bool disable_twin_composition_manager;
 
 Workspace *Workspace::_self = 0;
 
-TDEProcess* kompmgr = 0;
-TDESelectionOwner* kompmgr_selection;
-
-bool allowKompmgrRestart = true;
-extern bool disable_twin_composition_manager;
-
 bool supportsCompMgr()
 {
     if (disable_twin_composition_manager) {
@@ -163,7 +158,10 @@ Workspace::Workspace( bool restore )
     topmenu_space( NULL ),
     set_active_client_recursion( 0 ),
     block_stacking_updates( 0 ),
-    forced_global_mouse_grab( false )
+    forced_global_mouse_grab( false ),
+    kompmgr( NULL ),
+    kompmgr_selection( NULL ),
+    allowKompmgrRestart( true )
     {
     _self = this;
     mgr = new PluginMgr;
diff --git a/twin/workspace.h b/twin/workspace.h
index 637a14e77..5f1d71025 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -665,6 +665,10 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         friend class Client;
 
         //kompmgr
+        TDEProcess* kompmgr;
+        TDESelectionOwner* kompmgr_selection;
+        bool allowKompmgrRestart;
+
         TQSlider *transSlider;
         TQPushButton *transButton;
         // not used yet