3 files changed, 14 insertions, 94 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index aa5926702731..5f4a2bda25f8 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 f7ef753dc628..68c8f1f1286d 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, sal_Bool bShow )
         : m_pSocket( NULL ),
diff --git a/vcl/unx/gtk/window/makefile.mk b/vcl/unx/gtk/window/makefile.mk
deleted file mode 100644
index ac23e9363eef..000000000000
--- a/vcl/unx/gtk/window/makefile.mk
+++ /dev/null
@@ -1,79 +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=gtkwin
-.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
-.IF "$(ENABLE_DBUS)" != ""
-CDEFS+=-DENABLE_DBUS
-PKGCONFIG_MODULES+= dbus-glib-1
-.ENDIF
-.INCLUDE : pkg_config.mk
-
-.IF "$(COM)" == "C52"
-NOOPTFILES=$(SLO)$/gtkframe.obj
-.ENDIF
-
-SLOFILES=\
-            $(SLO)$/gtkframe.obj				\
-            $(SLO)$/gtkobject.obj
-EXCEPTIONSFILES=$(SLO)$/gtkframe.obj
-.ELSE # "$(ENABLE_GTK)" != ""
-
-dummy:
-    @echo GTK disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk