2 files changed, 28 insertions, 19 deletions
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index 8e47c9aeea0c..13291d1f305d 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -28,14 +28,19 @@
 #ifndef _VCL_SM_HXX
 #define _VCL_SM_HXX
 
-#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
-#include "tools/link.hxx"
-#include "unx/salunx.h"
+#include "sal/config.h"
+
 #include <X11/SM/SMlib.h>
-#include "salsession.hxx"
+
+#include "tools/link.hxx"
 #include "vclpluginapi.h"
 
+namespace rtl {
+    class OString;
+    class OUString;
+}
+class SalSession;
+
 class SessionManagerClient
 {
     static SalSession * m_pSession;
@@ -77,20 +82,6 @@ public:
     static VCLPLUG_GEN_PUBLIC const rtl::OString& getSessionID();
 };
 
-class SalFrame;
-
-class IceSalSession : public SalSession
-{
-public:
-    IceSalSession();
-    virtual ~IceSalSession();
-
-    virtual void queryInteraction();
-    virtual void interactionDone();
-    virtual void saveDone();
-    virtual bool cancelShutdown();
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 1f8debf3e209..8ba6e9cd2082 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -56,6 +56,24 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 
+#include "salsession.hxx"
+
+namespace {
+
+class IceSalSession : public SalSession
+{
+public:
+    IceSalSession();
+    virtual ~IceSalSession();
+
+    virtual void queryInteraction();
+    virtual void interactionDone();
+    virtual void saveDone();
+    virtual bool cancelShutdown();
+};
+
+}
+
 SalSession* X11SalInstance::CreateSalSession()
 {
     SalSession * p = new IceSalSession;