16 files changed, 25 insertions, 43 deletions
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 4b163ae405b9..3b4f26f46d42 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 140c561a7662..f4c443f46cae 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 613151f51037..7ee05574a19f 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 67ae197475a8..27bc8a35d83b 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 5c9839af094c..8e21e8ccfd85 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 80c337e6163f..e3fe725f4583 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 a2d8f529fae6..ab0aa38112cf 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 4b11e9b02707..e21ee68042a7 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 07facc67709b..16742d29c416 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 97f5656c2506..000000000000
--- 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 56f0959f89ca..4bf21ef7fcd5 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 86c2f1e7c91a..1bea1685b6a5 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 f3601baf02b3..19e0551b3e53 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 9882eca8feba..be1c7b94dd4d 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 5ace8e832707..daf8b5f8e8dd 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 5dc8e7d10bf3..6d2a0602d2dd 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"