4 files changed, 18 insertions, 95 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 36d475b8795b..4140894c36af 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 2b0e90dc9bc0..888e2ed883b9 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>
 
@@ -131,7 +130,7 @@ extern "C"
         return true;
     }
 
-    VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule pModule )
+    VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule pModule )
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
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/app/makefile.mk b/vcl/unx/gtk/app/makefile.mk
deleted file mode 100644
index 3e8cd750bf7a..000000000000
--- a/vcl/unx/gtk/app/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=gtkapp
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_GTK)" != ""
-
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE : pkg_config.mk
-
-SLOFILES=\
-            $(SLO)$/gtkdata.obj	\
-            $(SLO)$/gtkinst.obj	\
-            $(SLO)$/gtksys.obj
-
-EXCEPTIONSFILES=\
-            $(SLO)$/gtkdata.obj\
-            $(SLO)$/gtkinst.obj
-
-.ELSE # "$(ENABLE_GTK)" != ""
-
-dummy:
-    @echo GTK disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk