6 files changed, 11 insertions, 86 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 72c665df19b0..e56dcda81a9f 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -30,7 +30,7 @@
 
 
 #include <ide_pch.hxx>
-
+#include <svx/svxids.hrc>
 
 #define GLOBALOVERFLOW2
 
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 1b981c9dacdf..4ab42fbe97a7 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -45,7 +45,7 @@
 #include "localizationmgr.hxx"
 #include "managelang.hxx"
 #include "dlgresid.hrc"
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 
 #include <svtools/langtab.hxx>
 
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index a2f7f0887a7c..afbe3daf5be1 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -61,7 +61,7 @@
 #include <helpid.hrc>
 #include <bastype2.hxx>
 #include <svx/svdview.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 507b70e02058..2ff30ed6f2a0 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -26,6 +26,9 @@
  ************************************************************************/
 #include <svheader.hxx>
 
+#define ITEMID_SEARCH           0
+#define ITEMID_SIZE             0
+
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/menu.hxx>
@@ -35,6 +38,8 @@
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
+#include <svl/srchitem.hxx>
 
 #define _BASIC_TEXTPORTIONS
 #include <basic/sbdef.hxx>
@@ -60,86 +65,6 @@
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/progress.hxx>
+#include <editeng/sizeitem.hxx>
 
 
-#define ITEMID_FONT             0
-#define ITEMID_POSTURE          0
-#define ITEMID_WEIGHT           0
-#define ITEMID_SHADOWED         0
-#define ITEMID_CONTOUR          0
-#define ITEMID_CROSSEDOUT       0
-#define ITEMID_UNDERLINE        0
-#define ITEMID_FONTHEIGHT       0
-#define ITEMID_COLOR            0
-#define ITEMID_ADJUST           0
-#define ITEMID_LINESPACING      0
-#define ITEMID_TABSTOP          0
-#define ITEMID_LRSPACE          0
-#define ITEMID_ULSPACE          0
-#define ITEMID_SEARCH           0
-#define ITEMID_SEARCH           0
-#define ITEMID_SIZE             0
-#define ITEMID_FONTLIST     0
-#define ITEMID_AUTOKERN     0
-#define ITEMID_WORDLINEMODE 0
-#define ITEMID_PROPSIZE     0
-#define ITEMID_CHARSETCOLOR 0
-#define ITEMID_KERNING      0
-#define ITEMID_CASEMAP      0
-#define ITEMID_ESCAPEMENT   0
-#define ITEMID_LANGUAGE     0
-#define ITEMID_NOLINEBREAK  0
-#define ITEMID_NOHYPHENHERE 0
-#define ITEMID_BLINK        0
-#define ITEMID_PAPERBIN     0
-#define ITEMID_PRINT        0
-#define ITEMID_OPAQUE       0
-#define ITEMID_PROTECT      0
-#define ITEMID_SHADOW       0
-#define ITEMID_BOX          0
-#define ITEMID_BOXINFO      0
-#define ITEMID_FMTBREAK     0
-#define ITEMID_FMTKEEP      0
-#define ITEMID_LINE         0
-#define ITEMID_BRUSH        0
-
-#include <svx/srchitem.hxx>
-#include <svx/flstitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fwdtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-
-#include <svx/cmapitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/nlbkitem.hxx>
-#include <svx/nhypitem.hxx>
-#include <svx/lcolitem.hxx>
-#include <svx/blnkitem.hxx>
-
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/prntitem.hxx>
-#include <svx/opaqitem.hxx>
-#include <svx/protitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/brshitem.hxx>
-
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index b4d2877e19fa..a15bed689b6f 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -53,7 +53,7 @@
 
 
 #define ITEMID_SEARCH   0
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 
 using ::rtl::OUString;
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 57f36dcdc3cc..41c86699203b 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -53,7 +53,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 
 #include <svtools/langtab.hxx>