vcl2gnumake: #i116589# header cleanup: linux,solaris,macos

9 files changed, 44 insertions, 46 deletions

diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index 25add8e0dd18..71c05bd16626 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/atkbridge.hxx>
-#include <plugins/gtk/gtkframe.hxx>
+#include <unx/gtk/atkbridge.hxx>
+#include <unx/gtk/gtkframe.hxx>
 
 #include "atkfactory.hxx"
 #include "atkutil.hxx"
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index d2574f616539..9588123f4032 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
 #include "atkwrapper.hxx"
 #include "atkfactory.hxx"
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 5448235998e8..83c1c14876e1 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
 #include "vcl/popupmenuwindow.hxx"
 
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index f308822df147..eac10d041021 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -46,19 +46,19 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
-#include <plugins/gtk/gtkframe.hxx>
-#include <salobj.h>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/salobj.h>
 #include <osl/thread.h>
 #include <osl/process.h>
 
 #include <tools/debug.hxx>
-#include "i18n_im.hxx"
-#include "i18n_xkb.hxx"
-#include <wmadaptor.hxx>
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_xkb.hxx"
+#include <unx/wmadaptor.hxx>
 
-#include "../../unx/source/inc/salcursors.h"
+#include "unx/x11_cursors/salcursors.h"
 
 #include <vcl/svapp.hxx>
 
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 2cb92ecd8292..22adb201aa72 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -29,13 +29,12 @@
 #include "precompiled_vcl.hxx"
 
 #include <osl/module.h>
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
-#include <salframe.h>
-#include <salobj.h>
-#include <plugins/gtk/gtkframe.hxx>
-#include <plugins/gtk/gtkobject.hxx>
-#include <plugins/gtk/atkbridge.hxx>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
+#include <unx/salobj.h>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkobject.hxx>
+#include <unx/gtk/atkbridge.hxx>
 
 #include <rtl/strbuf.hxx>
 
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 272af20d0886..daaf4b27bc5c 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svunx.h>
-#include <vcl/svdata.hxx>
+#include <unx/svunx.h>
+#include <svdata.hxx>
 #include <vcl/window.hxx>
-#include <plugins/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkinst.hxx>
 #include <cstdio>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ff615f5ede74..a97198d7def8 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -28,12 +28,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "plugins/gtk/gtkframe.hxx"
-#include "plugins/gtk/gtkdata.hxx"
-#include "plugins/gtk/gtkinst.hxx"
-#include "plugins/gtk/gtkgdi.hxx"
+#include "vcl/svapp.hxx"
+
+#include "unx/gtk/gtkframe.hxx"
+#include "unx/gtk/gtkdata.hxx"
+#include "unx/gtk/gtkinst.hxx"
+#include "unx/gtk/gtkgdi.hxx"
 
-#include "pspgraphics.h"
+#include "unx/pspgraphics.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
 
 #include <cstdio>
 #include <cmath>
@@ -41,10 +45,6 @@
 #include <algorithm>
 #include <hash_map>
 
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "vcl/svapp.hxx"
-
 typedef struct _cairo_font_options cairo_font_options_t;
 
 // initialize statics
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 9181ee3fd40d..f26750695180 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -28,17 +28,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkframe.hxx>
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
-#include <plugins/gtk/gtkgdi.hxx>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkgdi.hxx>
 #include <vcl/keycodes.hxx>
-#include <wmadaptor.hxx>
-#include <sm.hxx>
-#include <salbmp.h>
-#include <salprn.h>
+#include <unx/wmadaptor.hxx>
+#include <unx/sm.hxx>
+#include <unx/salbmp.h>
+#include <unx/salprn.h>
 #include <vcl/floatwin.hxx>
-#include <salprn.h>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 
@@ -49,8 +48,8 @@
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/impbmp.hxx>
-#include <vcl/svids.hrc>
+#include <impbmp.hxx>
+#include <svids.hrc>
 
 #include <algorithm>
 
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index c5f5a168f653..f2ab26179d27 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkobject.hxx>
-#include <plugins/gtk/gtkframe.hxx>
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkobject.hxx>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
 
 GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow )
         : m_pSocket( NULL ),