4 files changed, 5 insertions, 29 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 7ea94d9fa511..2cb1e55145d3 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -53,7 +53,7 @@
 #include <sfx2/evntconf.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/printer.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <svl/srchitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <svx/htmlmode.hxx>
@@ -61,7 +61,6 @@
 #include <sot/clsids.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
-//#include <basic/sbjsmod.hxx>
 #include <swevent.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtfsize.hxx>
@@ -111,7 +110,7 @@
 #include <cfgid.h>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/fltrcfg.hxx>
-#include <svx/htmlcfg.hxx>
+#include <svtools/htmlcfg.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/objface.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 2479107ae4f8..4fdea2d38106 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -79,7 +79,7 @@
 #include <editeng/langitem.hxx>
 #include <svx/fmshell.hxx>
 
-#include <svx/htmlcfg.hxx>
+#include <svtools/htmlcfg.hxx>
 #include <svx/ofaitem.hxx>
 #include <SwSmartTagMgr.hxx>
 #include <sfx2/app.hxx>
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 2898b915c175..14d28d722b41 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -34,9 +34,7 @@
 
 #include <hintids.hxx>
 
-#ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
-#endif
 #include <i18npool/mslangid.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
@@ -46,45 +44,33 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/bindings.hxx>
-#include <svx/asiancfg.hxx>
+#include <svl/asiancfg.hxx>
 #include <editeng/unolingu.hxx>
 #include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/adjitem.hxx>
-#ifndef _SVX_AKRNTEM_HXX
 #include <editeng/akrnitem.hxx>
-#endif
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <rtl/logfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/xtable.hxx>
-#ifndef _SVX_DRAWITEM_HXX //autogen
-
 #include <svx/drawitem.hxx>
-#endif
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/flstitem.hxx>
-#ifndef _SVX_TSTPITEM_HXX //autogen
 #include <editeng/tstpitem.hxx>
-#endif
 #include <editeng/langitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/hyznitem.hxx>
 #include <editeng/svxacorr.hxx>
-
 #include <vcl/svapp.hxx>
 #include <view.hxx>
 #include <prtopt.hxx>
 #include <fmtcol.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
-#ifndef _WDOCSH_HXX
 #include <wdocsh.hxx>
-#endif
 #include <swmodule.hxx>
 #include <doc.hxx>
 #include <docfac.hxx>
@@ -92,18 +78,12 @@
 #include <shellio.hxx>
 #include <tox.hxx>
 #include <swdtflvr.hxx>
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <usrpref.hxx>
 #include <fontcfg.hxx>
 #include <poolfmt.hxx>
-#ifndef _MODCFG_HXX
 #include <modcfg.hxx>
-#endif
-#ifndef _GLOBDOC_HXX
 #include <globdoc.hxx>
-#endif
 #include <ndole.hxx>
 #include <mdiexp.hxx>
 #include <unotxdoc.hxx>
@@ -111,10 +91,7 @@
 #include <swwait.hxx>
 #include <wrtsh.hxx>
 #include <swerror.h>
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-
 
 // #i18732#
 #include <fmtfollowtextflow.hxx>
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 54f3e0d32f6f..b8cebf13686f 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -52,7 +52,7 @@
 #include <wdocsh.hxx>
 #include <fmtfsize.hxx>
 #include <fchrfmt.hxx>
-#include <svx/htmlcfg.hxx>
+#include <svtools/htmlcfg.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <undobj.hxx>
 #include <swundo.hxx>