Wed May 8 08:52:53 PDT 2013

RepositoryExternal.mk                    |   40 +++++++++--
 basctl/Library_basctl.mk                 |    6 +
 basctl/sdi/basslots.sdi                  |   10 +-
 cairo/ExternalProject_cairo.mk           |    2 
 clucene/ExternalPackage_clucene.mk       |  104 -------------------------------
 clucene/Library_clucene.mk               |    2 
 clucene/Module_clucene.mk                |    1 
 config_host.mk.in                        |    1 
 configure.ac                             |   55 ----------------
 desktop/Executable_oosplash.mk           |    2 
 distro-configs/LibreOfficeLinux.conf     |    2 
 expat/ExternalPackage_expat.mk           |   17 -----
 expat/Module_expat.mk                    |    1 
 fontconfig/ExternalProject_fontconfig.mk |    2 
 harfbuzz/ExternalPackage_harfbuzz.mk     |   17 -----
 jpeg/ExternalPackage_jpeg.mk             |   19 -----
 jpeg/Module_jpeg.mk                      |    1 
 libcmis/ExternalPackage_libcmis.mk       |   28 --------
 libcmis/Module_libcmis.mk                |    1 
 libcmis/StaticLibrary_cmis.mk            |    2 
 libmariadb/ExternalPackage_libmariadb.mk |   52 ---------------
 libmariadb/Module_libmariadb.mk          |    1 
 libpng/ExternalPackage_libpng.mk         |   19 -----
 libpng/Module_libpng.mk                  |    1 
 libpng/StaticLibrary_png.mk              |    2 
 mysqlcppconn/Library_mysqlcppconn.mk     |    5 -
 mythes/ExternalPackage_mythes.mk         |    4 -
 postgresql/ExternalPackage_postgresql.mk |    5 -
 python3/ExternalProject_python3.mk       |    5 -
 python3/UnpackedTarball_python3.mk       |    8 ++
 python3/python-3.3.0-zlib.patch.1        |   43 ++++++++++++
 sc/Library_sc.mk                         |    2 
 sc/sdi/scslots.sdi                       |   10 +-
 sd/Library_sd.mk                         |    4 +
 sd/sdi/sdgslots.sdi                      |   10 +-
 sd/sdi/sdslots.sdi                       |   10 +-
 sfx2/Library_sfx.mk                      |    4 -
 sfx2/Module_sfx2.mk                      |    1 
 sfx2/Package_sdi.mk                      |   24 -------
 starmath/Library_sm.mk                   |    2 
 starmath/sdi/smslots.sdi                 |   10 +-
 svx/Library_svxcore.mk                   |    5 -
 svx/Module_svx.mk                        |    1 
 svx/Package_sdi.mk                       |   25 -------
 svx/sdi/svxslots.sdi                     |    4 -
 sw/Library_sw.mk                         |    2 
 sw/sdi/swslots.sdi                       |   10 +-
 vcl/generic/glyphs/gcach_layout.cxx      |    4 -
 48 files changed, 141 insertions(+), 445 deletions(-)

New commits:
commit b65859c5c60f1a83c8da8c6dcab0b7c8fc580f13
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 17:30:40 2013 +0200

    jpeg: remove ExternalPackage_jpeg
    
    Change-Id: I09a4b3a3ef816a8bf63d4aa0c7fe7bec2a67dbd8

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6b4c82f..f636d7b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -395,8 +395,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 
 define gb_LinkTarget__use_jpeg
 $(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,jpeg) \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/external/jpeg \
 )
 
 $(call gb_LinkTarget_use_static_libraries,$(1),\
diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk
deleted file mode 100644
index c451ed5..0000000
--- a/jpeg/ExternalPackage_jpeg.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,jpeg_inc,jpeg))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,jpeg_inc,inc/external/jpeg,\
-	jconfig.h \
-	jerror.h \
-	jmorecfg.h \
-	jpeglib.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/jpeg/Module_jpeg.mk b/jpeg/Module_jpeg.mk
index 806d577..fea0f0b 100644
--- a/jpeg/Module_jpeg.mk
+++ b/jpeg/Module_jpeg.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,jpeg))
 ifeq ($(SYSTEM_JPEG),NO)
 
 $(eval $(call gb_Module_add_targets,jpeg,\
-	ExternalPackage_jpeg \
     UnpackedTarball_jpeg \
     StaticLibrary_jpeg \
 ))
commit 416b321666da20857a87b4a8c3991caed1f24587
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 17:22:22 2013 +0200

    libpng: remove ExternalPackage_libpng
    
    Change-Id: I478a057c07b9fe850401b96297a14d7842c0703f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5a9c2d5..6b4c82f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1875,6 +1875,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
 ))
 
 define gb_LinkTarget__use_png
+$(call gb_LinkTarget_set_include,$(1),\
+	$(LIBPNG_CFLAGS) \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	png \
 )
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index e27bf37..0326b5c 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
 		COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
 		ZLIB3RDLIB=-lz \
-		$(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
+		png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
 		$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
 		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
 		$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
diff --git a/configure.ac b/configure.ac
index 5061755..ec0a4a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11057,7 +11057,7 @@ dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
 
-libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lpng"])
+libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/png"],["-L${OUTDIR}/lib -lpng"])
 
 dnl ===================================================================
 dnl Check for runtime JVM search path
diff --git a/libpng/ExternalPackage_libpng.mk b/libpng/ExternalPackage_libpng.mk
deleted file mode 100644
index 6fb731d..0000000
--- a/libpng/ExternalPackage_libpng.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,libpng_inc,png))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libpng_inc,inc/external/libpng,\
-	png.h \
-	pngconf.h \
-	pnglibconf.h \
-	pngstruct.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libpng/Module_libpng.mk b/libpng/Module_libpng.mk
index 6ee8e4c..d61375d 100644
--- a/libpng/Module_libpng.mk
+++ b/libpng/Module_libpng.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libpng))
 ifeq ($(SYSTEM_LIBPNG),NO)
 
 $(eval $(call gb_Module_add_targets,libpng,\
-	ExternalPackage_libpng \
 	StaticLibrary_png \
 	UnpackedTarball_png \
 ))
diff --git a/libpng/StaticLibrary_png.mk b/libpng/StaticLibrary_png.mk
index 3efcc4b..8759caf 100644
--- a/libpng/StaticLibrary_png.mk
+++ b/libpng/StaticLibrary_png.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,png))
 
 $(eval $(call gb_StaticLibrary_use_unpacked,png,png))
 
-$(eval $(call gb_StaticLibrary_use_package,png,libpng_inc))
-
 $(eval $(call gb_StaticLibrary_use_externals,png,\
 	zlib \
 ))
commit cc858aca0ebf653eebceaf09e2316763d8d81051
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 17:10:37 2013 +0200

    configure: substantially de-bong libpng handling
    
    - remove --unix-qstart-libpng:
      the internal libpng is static lib so this option is pointless
    - clean up duplicative libpng checks
    - replace usage of ENABLE_QUICKSTART_LIBPNG with ENABLE_HEADLESS,
      which is the one case where it could still be disabled
    
    Change-Id: Ie2e2c7e4a2396572742fdf056bf23c4271f04811

diff --git a/config_host.mk.in b/config_host.mk.in
index 7e469aa..6e5e0cd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -150,7 +150,6 @@ export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
-export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@
 export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_READONLY_INSTALLSET=@ENABLE_READONLY_INSTALLSET@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
diff --git a/configure.ac b/configure.ac
index b8e0961..5061755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -979,13 +979,6 @@ AC_ARG_ENABLE(headless,
         server usage. Work in progress, use only if you are hacking on
         it. Not related to the --headless option.]), ,)
 
-AC_ARG_ENABLE(unix-qstart-libpng,
-    AS_HELP_STRING([--disable-unix-qstart-libpng],
-        [On UNIX systems, we have a faster splash app, that can use libpng to
-         render its splash, if we can safely link to the system libpng then
-         enabling this is a good idea (ie. for Linux Distro packaging).]),
-,enable_unix_qstart_libpng=yes)
-
 AC_ARG_ENABLE(rpath,
     AS_HELP_STRING([--disable-rpath],
         [Disable the use of relative paths in shared libraries.]),
@@ -1650,11 +1643,6 @@ AC_ARG_WITH(system-npapi-headers,
     [with_system_npapi_headers="$with_system_headers"]
 )
 
-AC_ARG_WITH(system-libpng,
-    AS_HELP_STRING([--with-system-libpng],
-        [Use libpng already on system.]),,
-    [with_system_libpng=auto])
-
 AC_ARG_WITH(linker-hash-style,
     AS_HELP_STRING([--with-linker-hash-style],
         [Use linker with --hash-style=<style> when linking shared objects.
@@ -4330,7 +4318,6 @@ if test "$enable_headless" = "yes"; then
     test_tde=no
     test_kde=no
     test_kde4=no
-    enable_unix_qstart_libpng=no
     enable_cairo_canvas=no
     enable_gnome_vfs=no
 fi
@@ -9536,21 +9523,6 @@ AC_SUBST(TELEPATHY_LIBS)
 
 dnl ===================================================================
 
-if test "$enable_headless" != "yes"; then
-    PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
-fi
-AC_SUBST(LIBPNG_LIBS)
-AC_SUBST(LIBPNG_CFLAGS)
-
-AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test "x$enable_unix_qstart_libpng" != "xno"; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-    ENABLE_QUICKSTART_LIBPNG=""
-fi
-AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
-
 SPLIT_APP_MODULES=""
 if test "$enable_split_app_modules" = "yes"; then
     SPLIT_APP_MODULES="YES"
@@ -11085,32 +11057,7 @@ dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
 dnl ===================================================================
 
-AC_MSG_CHECKING([whether to use the system libpng])
-
-dnl How should and does this interact with the checks for libpng
-dnl related to use of libpng in the quickstarter above? This needs to
-dnl be unified.
-
-if test "$with_system_libpng" = "auto"; then
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        with_system_libpng="$with_system_libs"
-        ;;
-    *)
-        with_system_libpng=yes
-        ;;
-    esac
-fi
-
-if test "$with_system_libpng" = yes; then
-    SYSTEM_LIBPNG=YES
-    AC_MSG_RESULT([yes])
-else
-    SYSTEM_LIBPNG=NO
-    BUILD_TYPE="$BUILD_TYPE LIBPNG"
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(SYSTEM_LIBPNG)
+libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lpng"])
 
 dnl ===================================================================
 dnl Check for runtime JVM search path
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 78112b8..51657fe 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\
 endif
 endif
 
-ifeq ($(ENABLE_QUICKSTART_LIBPNG),TRUE)
+ifneq ($(ENABLE_HEADLESS),TRUE)
 
 $(eval $(call gb_Executable_add_defs,oosplash,\
     -DENABLE_QUICKSTART_LIBPNG \
commit bcc527412ee50ff646098195566e2c66007df59a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 15:48:43 2013 +0200

    LibreOfficeLinux.conf: use system zlib
    
    It appears that there are some externals that link against the system
    zlib anyway, and the assumption is that system zlib will work
    everywhere.
    
    Change-Id: Id348ed88d00ec1495aa54871c994062b9e1b3e85

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index dbbdcb7..3836c73 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -2,7 +2,7 @@
 --with-system-dicts
 --with-myspell-dicts
 --without-unix-wrapper
---without-system-zlib
+--with-system-zlib
 --without-system-poppler
 --without-system-openssl
 --without-system-mesa-headers
commit 6afe0e5804f2a23f9fc9842d372fff77fd1023f1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 14:23:35 2013 +0200

    python3: build against internal zlib when that is requested
    
    Change-Id: I72798f704237f99ed49eeb3633a1e2ef481edeed

diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index 72c476d..f672d71 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,python3))
 $(eval $(call gb_ExternalProject_use_externals,python3,\
 	expat \
 	openssl \
+	zlib \
 ))
 
 $(eval $(call gb_ExternalProject_register_targets,python3,\
@@ -66,7 +67,7 @@ else
 # create a symlink "LO_lib" because the .so are in a directory with platform
 # specific name like build/lib.linux-x86_64-3.3
 
-python3_cflags =
+python3_cflags = $(ZLIB_CFLAGS)
 ifeq ($(ENABLE_VALGRIND),TRUE)
     python3_cflags += $(VALGRIND_CFLAGS)
 endif
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index 0d5fce5..37cf3aa 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -34,6 +34,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	python3/python-3.3.0-pythreadstate.patch.1 \
 ))
 
+ifneq ($(COM),MSC)
+ifeq ($(SYSTEM_ZLIB),NO)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+	python3/python-3.3.0-zlib.patch.1 \
+))
+endif
+endif
+
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	python3/python-3.3.0-15833.patch.1 \
diff --git a/python3/python-3.3.0-zlib.patch.1 b/python3/python-3.3.0-zlib.patch.1
new file mode 100644
index 0000000..a3091ff
--- /dev/null
+++ b/python3/python-3.3.0-zlib.patch.1
@@ -0,0 +1,43 @@
+sadly python's build system is so awful it needs patching to find internal zlib
+
+--- python3/setup.py	2013-05-08 13:42:03.826304937 +0200
++++ python3/setup.py	2013-05-08 13:57:53.027231320 +0200
+@@ -1332,7 +1332,11 @@
+         #
+         # You can upgrade zlib to version 1.1.4 yourself by going to
+         # http://www.gzip.org/zlib/
+-        zlib_inc = find_file('zlib.h', [], inc_dirs)
++        if os.environ.get('SYSTEM_ZLIB') == 'NO':
++            zlib_incdir = os.environ.get('WORKDIR') + '/' + '/UnpackedTarball/zlib/'
++            zlib_inc = find_file('zlib.h', inc_dirs, [zlib_incdir])
++        else:
++            zlib_inc = find_file('zlib.h', [], inc_dirs)
+         have_zlib = False
+         if zlib_inc is not None:
+             zlib_h = zlib_inc[0] + '/zlib.h'
+@@ -1347,13 +1351,23 @@
+                         version = line.split()[2]
+                         break
+             if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
++                if os.environ.get('SYSTEM_ZLIB') == 'NO':
++                    zlib_lib = 'zlib'
++                    zlib_libdir = os.environ.get('OUTDIR') + '/' + 'lib'
++#                    zlib_found = find_library_file(self.compiler, zlib_lib, lib_dirs, [zlib_libdir])
++                    zlib_found = [zlib_libdir]
++                else:
++                    zlib_lib = 'z'
++                    zlib_found = self.compiler.find_library_file(lib_dirs, zlib_lib)
++                if zlib_found:
+                     if host_platform == "darwin":
+                         zlib_extra_link_args = ('-Wl,-search_paths_first',)
+                     else:
+                         zlib_extra_link_args = ()
+                     exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z'],
++                                           libraries = [zlib_lib],
++                                           include_dirs = zlib_inc,
++                                           library_dirs = zlib_found,
+                                            extra_link_args = zlib_extra_link_args))
+                     have_zlib = True
+                 else:
commit 759d02bcdf9d1b6a95b26b483815ce0f4ae38569
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 00:55:21 2013 +0200

    libcmis: remove ExternalPackage_libcmis.mk
    
    Change-Id: Ib81300d8606281d7de46382c4f251f58ffffb5ad

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 813cf4d..5a9c2d5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -659,6 +659,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_cmis
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,cmis)/src \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	cmislib \
 )
diff --git a/libcmis/ExternalPackage_libcmis.mk b/libcmis/ExternalPackage_libcmis.mk
deleted file mode 100644
index 44f6655..0000000
--- a/libcmis/ExternalPackage_libcmis.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,libcmis_inc,cmis))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libcmis_inc,inc/external/libcmis,\
-	src/libcmis/allowable-actions.hxx \
-	src/libcmis/document.hxx \
-	src/libcmis/exception.hxx \
-	src/libcmis/folder.hxx \
-	src/libcmis/object-type.hxx \
-	src/libcmis/object.hxx \
-	src/libcmis/property-type.hxx \
-	src/libcmis/property.hxx \
-	src/libcmis/repository.hxx \
-	src/libcmis/session-factory.hxx \
-	src/libcmis/session.hxx \
-	src/libcmis/xml-utils.hxx \
-	src/libcmis/xmlserializable.hxx \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index a7fb0fd..ad8aa7a 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libcmis))
 ifeq ($(SYSTEM_CMIS),NO)
 
 $(eval $(call gb_Module_add_targets,libcmis,\
-	ExternalPackage_libcmis \
 	StaticLibrary_cmis \
 	UnpackedTarball_cmis \
 ))
diff --git a/libcmis/StaticLibrary_cmis.mk b/libcmis/StaticLibrary_cmis.mk
index d79f852..ace0326 100644
--- a/libcmis/StaticLibrary_cmis.mk
+++ b/libcmis/StaticLibrary_cmis.mk
@@ -21,8 +21,6 @@ endif
 
 $(eval $(call gb_StaticLibrary_use_unpacked,cmislib,cmis))
 
-$(eval $(call gb_StaticLibrary_use_package,cmislib,libcmis_inc))
-
 $(eval $(call gb_StaticLibrary_use_externals,cmislib,\
 	boost_headers \
 	curl \
commit 6416e9b628bbdd7165b757c1207f87db7dd974dd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 00:35:28 2013 +0200

    libmariadb: remove ExternalPackage_libmariadb
    
    Change-Id: I15bf4537a88f2ae290d778ada993f06ec99c2fa5

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a7b0f0..813cf4d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -57,13 +57,16 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_mariadb
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(MARIADB_CFLAGS) \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	mariadblib \
 )
 
 endef
 define gb_ExternalProject__use_mariadb
-$(call gb_ExternalProject_use_package,$(1),libmariadb_inc)
 $(call gb_ExternalProject_use_static_libraries,$(1),mariadblib)
 
 endef
diff --git a/libmariadb/ExternalPackage_libmariadb.mk b/libmariadb/ExternalPackage_libmariadb.mk
deleted file mode 100644
index 3ed95d1..0000000
--- a/libmariadb/ExternalPackage_libmariadb.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmariadb_inc,mariadb))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libmariadb_inc,inc/external/libmariadb,\
-    include/config-win.h \
-    include/dbug.h \
-    include/errmsg.h \
-    include/getopt.h \
-    include/global.h \
-    include/hash.h \
-    include/m_ctype.h \
-    include/m_string.h \
-    include/my_alarm.h \
-    include/my_base.h \
-    include/my_dir.h \
-    include/my_global.h \
-    include/my_list.h \
-    include/my_net.h \
-    include/my_no_pthread.h \
-    include/my_pthread.h \
-    include/my_secure.h \
-    include/mysql_com.h \
-    include/mysql_version.h \
-    include/mysqld_error.h \
-    include/mysql.h \
-    include/mysql_io.h \
-    include/mysql_mm.h \
-    include/mysql_priv.h \
-    include/mysql_wireprotocol.h \
-    include/my_stmt.h \
-    include/mysys_err.h \
-    include/my_sys.h \
-    include/sha1.h \
-    include/thr_alarm.h \
-    include/violite.h \
-))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libmariadb_inc,inc/external/libmariadb/mysql,\
-    include/mysql/client_plugin.h \
-    include/mysql/plugin_auth_common.h \
-    include/mysql/plugin_auth.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libmariadb/Module_libmariadb.mk b/libmariadb/Module_libmariadb.mk
index 667d55d..09c726d 100644
--- a/libmariadb/Module_libmariadb.mk
+++ b/libmariadb/Module_libmariadb.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libmariadb))
 ifeq ($(SYSTEM_MARIADB),NO)
 
 $(eval $(call gb_Module_add_targets,libmariadb,\
-	ExternalPackage_libmariadb \
 	StaticLibrary_mariadb \
 	UnpackedTarball_mariadb \
 ))
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/mysqlcppconn/Library_mysqlcppconn.mk
index 8555ab2..adebc5b 100644
--- a/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/mysqlcppconn/Library_mysqlcppconn.mk
@@ -43,11 +43,6 @@ $(eval $(call gb_Library_add_defs,mysqlcppconn,\
 	-D_SCL_SECURE_NO_WARNINGS ) \
 ))
 
-$(eval $(call gb_Library_set_include,mysqlcppconn,\
-	$$(INCLUDE) \
-	$(MARIADB_CFLAGS) \
-))
-
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 	-lpthread \
commit ee8323e2280c72eb5cc9ec0257164154b2580a78
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 00:19:40 2013 +0200

    postgresql: stop delivering headers
    
    Change-Id: I1c08999207a90e6105fbba576354cbfea0ec1689

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5866192..2a7b0f0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2127,7 +2127,8 @@ $(call gb_LinkTarget_use_packages,$(1),\
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(OUTDIR)/inc/postgresql \
+	-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \
+	-I$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq \
 	$$(INCLUDE) \
 )
 
diff --git a/postgresql/ExternalPackage_postgresql.mk b/postgresql/ExternalPackage_postgresql.mk
index bc5aee1..80ccbc9 100644
--- a/postgresql/ExternalPackage_postgresql.mk
+++ b/postgresql/ExternalPackage_postgresql.mk
@@ -11,11 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,postgresql,postgresql))
 
 $(eval $(call gb_ExternalPackage_use_external_project,postgresql,postgresql))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,postgresql,inc/postgresql,\
-	src/include/postgres_ext.h \
-	src/interfaces/libpq/libpq-fe.h \
-))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
 	src/interfaces/libpq/libpq.lib \
commit 90ad80e3a4306600bb4ee6b6793131dbcfbfe203
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 7 23:59:00 2013 +0200

    mythes: stop delivering headers
    
    Change-Id: I10a9e7836ce648a0f789be479a7c90bbff592b37

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2bda818..5866192 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -422,6 +422,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_mythes
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,mythes) \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_package,$(1),\
 	mythes \
 )
diff --git a/mythes/ExternalPackage_mythes.mk b/mythes/ExternalPackage_mythes.mk
index 9935661..cd8907c 100644
--- a/mythes/ExternalPackage_mythes.mk
+++ b/mythes/ExternalPackage_mythes.mk
@@ -17,8 +17,4 @@ $(eval $(call gb_ExternalPackage_add_file,mythes,lib/libmythes.a,.libs/libmythes
 
 endif
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,mythes,inc,\
-    mythes.hxx \
-))
-
 # vim: set noet sw=4 ts=4:
commit 28cde0c9ab8e34be4084c0f7494195877b66ceab
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 7 23:47:27 2013 +0200

    clucene: remove ExternalPackage_clucene
    
    Change-Id: Ib120919cf3810eeba8332dd572af73c0f4979922

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index deb0406..2bda818 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2006,6 +2006,13 @@ endef
 else # !SYSTEM_CLUCENE
 
 define gb_LinkTarget__use_clucene
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \
+	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \
+	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \
+	$$(INCLUDE) \
+)
+
 $(call gb_LinkTarget_use_libraries,$(1),\
 	clucene \
 )
diff --git a/clucene/ExternalPackage_clucene.mk b/clucene/ExternalPackage_clucene.mk
deleted file mode 100644
index 01034c8..0000000
--- a/clucene/ExternalPackage_clucene.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,clucene_inc,clucene))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene.h,src/core/CLucene.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/DateField.h,src/core/CLucene/document/DateField.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/DateTools.h,src/core/CLucene/document/DateTools.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/Document.h,src/core/CLucene/document/Document.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/Field.h,src/core/CLucene/document/Field.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/NumberTools.h,src/core/CLucene/document/NumberTools.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/Term.h,src/core/CLucene/index/Term.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/BooleanClause.h,src/core/CLucene/search/BooleanClause.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/BooleanQuery.h,src/core/CLucene/search/BooleanQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/DateFilter.h,src/core/CLucene/search/DateFilter.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Explanation.h,src/core/CLucene/search/Explanation.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Hits.h,src/core/CLucene/search/Hits.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/IndexSearcher.h,src/core/CLucene/search/IndexSearcher.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/FilteredTermEnum.h,src/core/CLucene/search/FilteredTermEnum.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/FuzzyQuery.h,src/core/CLucene/search/FuzzyQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/MultiSearcher.h,src/core/CLucene/search/MultiSearcher.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Searchable.h,src/core/CLucene/search/Searchable.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/SearchHeader.h,src/core/CLucene/search/SearchHeader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Similarity.h,src/core/CLucene/search/Similarity.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Sort.h,src/core/CLucene/search/Sort.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/PhraseQuery.h,src/core/CLucene/search/PhraseQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/PrefixQuery.h,src/core/CLucene/search/PrefixQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Query.h,src/core/CLucene/search/Query.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/RangeQuery.h,src/core/CLucene/search/RangeQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/WildcardQuery.h,src/core/CLucene/search/WildcardQuery.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/Array.h,src/core/CLucene/util/Array.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/debug/error.h,src/core/CLucene/debug/error.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h))
-$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 50a32e9..7ac8a48 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
-$(eval $(call gb_Library_use_package,clucene,clucene_inc))
-
 $(eval $(call gb_Library_use_unpacked,clucene,clucene))
 
 $(eval $(call gb_Library_set_warnings_not_errors,clucene))
diff --git a/clucene/Module_clucene.mk b/clucene/Module_clucene.mk
index f02b296..aa4a57b 100644
--- a/clucene/Module_clucene.mk
+++ b/clucene/Module_clucene.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,clucene))
 ifeq ($(SYSTEM_CLUCENE),NO)
 ifneq ($(OS),ANDROID)
 $(eval $(call gb_Module_add_targets,clucene,\
-    ExternalPackage_clucene \
     Library_clucene \
 	UnpackedTarball_clucene \
 ))
commit 8db0275b2645c5cf745aaa4b9f9bd9c11cf11607
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 7 23:28:45 2013 +0200

    harfbuzz: stop delivering headers
    
    Change-Id: I6a68b2df3a5bd4076e07729b675179e52f4f0615

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3fa4524..deb0406 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1217,6 +1217,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	harfbuzz \
 ))
 define gb_LinkTarget__use_harfbuzz
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,harfbuzz)/src \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_package,$(1),\
 	harfbuzz \
 )
diff --git a/harfbuzz/ExternalPackage_harfbuzz.mk b/harfbuzz/ExternalPackage_harfbuzz.mk
index 0894b2e7..cb3339d 100644
--- a/harfbuzz/ExternalPackage_harfbuzz.mk
+++ b/harfbuzz/ExternalPackage_harfbuzz.mk
@@ -9,23 +9,6 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,harfbuzz,harfbuzz))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,harfbuzz,inc/external/harfbuzz,\
-	src/hb.h \
-	src/hb-blob.h \
-	src/hb-buffer.h \
-	src/hb-common.h \
-	src/hb-font.h \
-	src/hb-icu.h \
-	src/hb-ot.h \
-	src/hb-ot-layout.h \
-	src/hb-ot-tag.h \
-	src/hb-set.h \
-	src/hb-shape.h \
-	src/hb-shape-plan.h \
-	src/hb-unicode.h \
-	src/hb-version.h \
-))
-
 $(eval $(call gb_ExternalPackage_use_external_project,harfbuzz,harfbuzz))
 
 $(eval $(call gb_ExternalPackage_add_file,harfbuzz,lib/libharfbuzz.a,src/.libs/libharfbuzz.a))
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 7df803f..55ddaee 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -30,8 +30,8 @@
 #include <sal/alloca.h>
 #include <rtl/instance.hxx>
 
-#include <harfbuzz/hb-icu.h>
-#include <harfbuzz/hb-ot.h>
+#include <hb-icu.h>
+#include <hb-ot.h>
 
 #include <layout/LayoutEngine.h>
 #include <layout/LEFontInstance.h>
commit 5e037bbb3b7a0fdbbd4ce53e6ad566db057e1575
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 7 21:47:18 2013 +0200

    expat: remove ExternalPackage_expat
    
    Change-Id: I80b7f86947645a45263bbd7423a10ba8300441e9

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9a22c69..3fa4524 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -460,14 +460,10 @@ define gb_LinkTarget__use_expat_impl
 $(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
 
 $(call gb_LinkTarget_set_include,$(1),\
-    -I$(OUTDIR)/inc/external/expat \
+	-I$(call gb_UnpackedTarball_get_dir,expat)/lib \
     $$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_use_packages,$(1),\
-	expat_inc \
-)
-
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	$(2) \
 )
@@ -475,7 +471,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 endef
 
 define gb_ExternalProject__use_expat
-$(call gb_ExternalProject_use_package,$(1),expat_inc)
 $(call gb_ExternalProject_use_static_libraries,$(1),expat)
 
 endef
diff --git a/expat/ExternalPackage_expat.mk b/expat/ExternalPackage_expat.mk
deleted file mode 100644
index d969cb4..0000000
--- a/expat/ExternalPackage_expat.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,expat_inc,expat))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,expat_inc,inc/external/expat,\
-	lib/expat.h \
-	lib/expat_external.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/expat/Module_expat.mk b/expat/Module_expat.mk
index 8c7d8d0..990a2a3 100644
--- a/expat/Module_expat.mk
+++ b/expat/Module_expat.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,expat))
 ifeq ($(SYSTEM_EXPAT),NO)
 
 $(eval $(call gb_Module_add_targets,expat,\
-	ExternalPackage_expat \
 	UnpackedTarball_expat \
 	StaticLibrary_expat \
 ))
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index f4584f0..b520a11 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 		./configure \
 			--disable-shared \
 			--with-arch=arm \
-			--with-expat-includes=$(OUTDIR)/inc/external/expat \
+			--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
 			--with-expat-lib=$(OUTDIR)/lib \
 			--with-freetype-config=$(OUTDIR)/bin/freetype-config \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index b8953c7..72c476d 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -88,7 +88,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 		CC="$(strip $(CC) \
 			$(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \
 			$(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \
-			$(if $(filter NO,$(SYSTEM_EXPAT)),-I$(OUTDIR)/inc/external/expat) \
+			$(if $(filter NO,$(SYSTEM_EXPAT)),-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
 			$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
 			)" \
 		$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
commit 32b9ff886614c1afe117ffd4c1b8807582913725
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 7 19:00:10 2013 +0200

    svx: remove Package_sdi
    
    Change-Id: I0c648ca1b1f3cc22244d660e032bacbdbe0f642e

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 3b4f26f..c008ad6 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
 $(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
 
 $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index f4c443f..9235fd8 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -28,9 +28,9 @@ SlotIdFile( "basslots.hrc" )
     //=========================================================================
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
 
     include "baside.sdi"
 
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 7ee0557..2903aa6 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -589,6 +589,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
 $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
 	-I$(SRCDIR)/sc/inc \
 	-I$(SRCDIR)/sc/sdi \
+	-I$(SRCDIR)/svx/sdi \
 	-I$(SRCDIR)/sfx2/sdi \
 	$$(INCLUDE) \
 ))
diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi
index 27bc8a3..7ef3eec 100644
--- a/sc/sdi/scslots.sdi
+++ b/sc/sdi/scslots.sdi
@@ -42,9 +42,9 @@ ModulePrefix( "Sc" )
     // bei Problemen ggF. "von Hand" includen (=Copy/Paste)
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
 
     include "scalc.sdi"
     include "docsh.sdi"
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 8e21e8c..2efd42a 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots))
 $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/sdi \
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
@@ -25,6 +26,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdgslots,sd/sdi/sdgslots))
 $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/sdi \
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index e3fe725..01e7de1 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -27,9 +27,9 @@ ModulePrefix( "Sd" )
 {
         include "sfxitems.sdi"
         include "sfx.sdi"
-        include "svx/svxitems.sdi"
-        include "svx/xoitems.sdi"
-        include "svx/svx.sdi"
+        include "svxitems.sdi"
+        include "xoitems.sdi"
+        include "svx.sdi"
 
         item UINT16 TbxImageItem;
 
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index ab0aa38..7070cff 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -28,9 +28,9 @@ ModulePrefix( "Sd" )
 {
         include "sfxitems.sdi"
         include "sfx.sdi"
-        include "svx/svxitems.sdi"
-        include "svx/xoitems.sdi"
-        include "svx/svx.sdi"
+        include "svxitems.sdi"
+        include "xoitems.sdi"
+        include "svx.sdi"
 
         item UINT16 TbxImageItem;
 
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 4bf21ef..342190b 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
 $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
         -I$(SRCDIR)/starmath/inc \
         -I$(SRCDIR)/starmath/sdi \
+        -I$(SRCDIR)/svx/sdi \
         -I$(SRCDIR)/sfx2/sdi \
         $$(INCLUDE) \
 ))
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 1bea168..5291ca1 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -30,9 +30,9 @@ StarMath
 {
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
     include "smath.sdi"
     interface StarMath
     [
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 19e0551..e23ae2c 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
 
 $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
 
-$(eval $(call gb_Library_use_packages,svxcore,\
-    svx_sdi \
-))
-
 $(eval $(call gb_Library_use_custom_headers,svxcore,\
 	officecfg/registry \
 ))
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 093d11f..9a08fc4 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,svx,\
     AllLangResTarget_gal \
     AllLangResTarget_textconversiondlgs \
     Package_globlmn_hrc \
-    Package_sdi \
     UIConfig_svx \
 ))
 
diff --git a/svx/Package_sdi.mk b/svx/Package_sdi.mk
deleted file mode 100644
index 7d0927d..0000000
--- a/svx/Package_sdi.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,svx_sdi,$(SRCDIR)/svx/sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svx.sdi,svx.sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svxitems.sdi,svxitems.sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/xoitems.sdi,xoitems.sdi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index daf8b5f..7727862 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -743,6 +743,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
 $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/sdi \
+    -I$(SRCDIR)/svx/sdi \
     -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index 6d2a060..fa1e7df 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -28,9 +28,9 @@ ModulePrefix( "Sw" )
 {
     include "sfxitems.sdi"
     include "sfx.sdi"
-    include "svx/svxitems.sdi"
-    include "svx/xoitems.sdi"
-    include "svx/svx.sdi"
+    include "svxitems.sdi"
+    include "xoitems.sdi"
+    include "svx.sdi"
 
     item String TbxDummyItem;
 /*
commit 429a850d0d84176dfc1f952ec8c9d08881cf1a1c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 7 18:51:15 2013 +0200

    sfx2: remove Package_sdi
    
    There are just a handful of sdi files in sfx2 anyway so just put
    sfx2/sdi on include path.
    
    Change-Id: Ia9be889a63ba9a2f330b505613ae38158a4b7bdf

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 4b163ae..3b4f26f 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -124,6 +124,11 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
 
 $(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
 
+$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
+    -I$(SRCDIR)/sfx2/sdi \
+    $$(INCLUDE) \
+))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,basctl,\
 	advapi32 \
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index 140c561..f4c443f 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -26,8 +26,8 @@ SlotIdFile( "basslots.hrc" )
 ]
 {
     //=========================================================================
-    include "sfx2/sfxitems.sdi"
-    include "sfx2/sfx.sdi"
+    include "sfxitems.sdi"
+    include "sfx.sdi"
     include "svx/svxitems.sdi"
     include "svx/xoitems.sdi"
     include "svx/svx.sdi"
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 613151f..7ee0557 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -589,6 +589,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
 $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
 	-I$(SRCDIR)/sc/inc \
 	-I$(SRCDIR)/sc/sdi \
+	-I$(SRCDIR)/sfx2/sdi \
 	$$(INCLUDE) \
 ))
 
diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi
index 67ae197..27bc8a3 100644
--- a/sc/sdi/scslots.sdi
+++ b/sc/sdi/scslots.sdi
@@ -40,8 +40,8 @@ ModulePrefix( "Sc" )
 
     //----------------------------------------------------------
     // bei Problemen ggF. "von Hand" includen (=Copy/Paste)
-    include "sfx2/sfxitems.sdi"
-    include "sfx2/sfx.sdi"
+    include "sfxitems.sdi"
+    include "sfx.sdi"
     include "svx/svxitems.sdi"
     include "svx/xoitems.sdi"
     include "svx/svx.sdi"
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 5c9839a..8e21e8c 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots))
 $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/sdi \
+    -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
 
@@ -24,6 +25,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdgslots,sd/sdi/sdgslots))
 $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/sdi \
+    -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
 
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index 80c337e..e3fe725 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -25,8 +25,8 @@ SlotIdFile( "sdslots.hrc" )
 ModulePrefix( "Sd" )
 ]
 {
-        include "sfx2/sfxitems.sdi"
-        include "sfx2/sfx.sdi"
+        include "sfxitems.sdi"
+        include "sfx.sdi"
         include "svx/svxitems.sdi"
         include "svx/xoitems.sdi"
         include "svx/svx.sdi"
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index a2d8f52..ab0aa38 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -26,8 +26,8 @@ SlotIdFile( "sdslots.hrc" )
 ModulePrefix( "Sd" )
 ]
 {
-        include "sfx2/sfxitems.sdi"
-        include "sfx2/sfx.sdi"
+        include "sfxitems.sdi"
+        include "sfx.sdi"
         include "svx/svxitems.sdi"
         include "svx/xoitems.sdi"
         include "svx/svx.sdi"
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4b11e9b..e21ee68 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -19,10 +19,6 @@
 
 $(eval $(call gb_Library_Library,sfx))
 
-$(eval $(call gb_Library_use_packages,sfx,\
-    sfx2_sdi \
-))
-
 $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 
 $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 07facc6..16742d29 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Module_Module,sfx2))
 $(eval $(call gb_Module_add_targets,sfx2,\
     AllLangResTarget_sfx2 \
     Library_sfx \
-    Package_sdi \
     UIConfig_sfx \
 ))
 
diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk
deleted file mode 100644
index 97f5656..0000000
--- a/sfx2/Package_sdi.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi))
-$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi))
-$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 56f0959..4bf21ef 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
 $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
         -I$(SRCDIR)/starmath/inc \
         -I$(SRCDIR)/starmath/sdi \
+        -I$(SRCDIR)/sfx2/sdi \
         $$(INCLUDE) \
 ))
 
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 86c2f1e..1bea168 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -28,8 +28,8 @@ StarMath
     SlotIdFile ( "svx/svxids.hrc" )
 ]
 {
-    include "sfx2/sfxitems.sdi"
-    include "sfx2/sfx.sdi"
+    include "sfxitems.sdi"
+    include "sfx.sdi"
     include "svx/svxitems.sdi"
     include "svx/xoitems.sdi"
     include "svx/svx.sdi"
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index f3601ba..19e0551 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -460,6 +460,7 @@ $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
     $$(INCLUDE) \
     -I$(SRCDIR)/svx/inc \
     -I$(SRCDIR)/svx/sdi \
+    -I$(SRCDIR)/sfx2/sdi \
 ))
 
 # Runtime dependency for unit-tests
diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi
index 9882eca..be1c7b9 100644
--- a/svx/sdi/svxslots.sdi
+++ b/svx/sdi/svxslots.sdi
@@ -26,8 +26,8 @@ SlotIdFile( "svxslots.hrc" )
 {
     //=========================================================================
 
-    include "sfx2/sfxitems.sdi"
-    include "sfx2/sfx.sdi"
+    include "sfxitems.sdi"
+    include "sfx.sdi"
     include "svxitems.sdi"
     include "xoitems.sdi"
     include "svx.sdi"
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 5ace8e8..daf8b5f 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -743,6 +743,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
 $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/sdi \
+    -I$(SRCDIR)/sfx2/sdi \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index 5dc8e7d..6d2a060 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -26,8 +26,8 @@ SlotIdFile( "swslots.hrc" )
 ModulePrefix( "Sw" )
 ]
 {
-    include "sfx2/sfxitems.sdi"
-    include "sfx2/sfx.sdi"
+    include "sfxitems.sdi"
+    include "sfx.sdi"
     include "svx/svxitems.sdi"
     include "svx/xoitems.sdi"
     include "svx/svx.sdi"
