11 files changed, 3 insertions, 16 deletions
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 79de982272f1..1a681beb263e 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -42,8 +42,6 @@
 #include <comphelper/processfactory.hxx>
 #include "sdbcdriverenum.hxx"
 
-#include <svx/svxids.hrc>
-
 //........................................................................
 namespace offapp
 {
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index c9834ad0b71d..23e8bf865626 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -37,7 +37,6 @@
 #include "connpooloptions.hxx"
 #include <svl/filenotation.hxx>
 #include <cuires.hrc>
-#include <svx/svxids.hrc>
 #include "helpid.hrc"
 #include <svtools/editbrowsebox.hxx>
 #include <cuires.hrc>
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 98d32f09013d..aaa8dc5302bc 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -30,7 +30,6 @@
 
 #include "dbregister.hrc"
 #include <cuires.hrc>
-#include <svx/svxids.hrc>
 #include <cuires.hrc>
 #include <svx/dialogs.hrc>
 
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 535f90cda4e4..6fd7e34b2729 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -33,7 +33,6 @@
 #include "dbregisterednamesconfig.hxx"
 #include <svl/itemset.hxx>
 #include <tools/diagnose_ex.h>
-#include <svx/svxids.hrc>
 #include <unotools/confignode.hxx>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 81d92e1e184a..1af621348023 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -31,19 +31,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "doclinkdialog.hxx"
-#ifndef _SVX_DOCLINKDIALOG_HRC_
 #include "doclinkdialog.hrc"
-#endif
 #include <cuires.hrc>
-#include <svx/svxids.hrc>
 #include <tools/debug.hxx>
-#ifndef SVTOOLS_FILENOTATION_HXX_
 #include <svl/filenotation.hxx>
-#endif
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/content.hxx>
 #include <dialmgr.hxx>
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index f3160d2f4808..3400162c6992 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -30,7 +30,6 @@
 
  // include ------------------------------------------------------------------
 
-#include <svx/svxids.hrc>
 #include "fontsubs.hrc"
 #include "helpid.hrc"
 
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 306f30b5850e..c32bffe730c9 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -35,6 +35,7 @@
 #include "optchart.hxx"
 #include "optchart.hrc"
 #include <dialmgr.hxx>
+#include <svx/svxids.hrc> // for SID_SCH_EDITOPTIONS
 
 // ====================
 // class ChartColorLB
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f82a04d21d79..58eeb487879d 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -44,7 +44,6 @@
 #include <boost/shared_ptr.hpp>
 #include <svx/svxdlg.hxx>
 #include <helpid.hrc>
-#include <svx/svxids.hrc>
 #include <dialmgr.hxx>
 #include "optcolor.hxx"
 #include <cuires.hrc>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2a8e8ed2c001..2c069130c40d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -70,7 +70,6 @@
 #include "cuitabarea.hxx"
 #include <cuires.hrc>
 #include <svx/unolingu.hxx>
-#include <svx/svxids.hrc>
 #include <svx/langitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 71d30851f2bd..85c0d450cc47 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -46,6 +46,7 @@
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/strarray.hxx>
+#include <svx/svxids.hrc> // SID_FIELD_GRABFOCUS
 
 #define TRIM(s) s.EraseLeadingChars().EraseTrailingChars()
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 22d24391a953..b8d7fec16efc 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -70,6 +70,7 @@
 #include "helpid.hrc"
 #include <svx/ofaitem.hxx>
 #include <svx/htmlmode.hxx>
+#include <svx/svxids.hrc> // slot ids, mostly for changetracking
 
 // for security TP
 #include <comphelper/processfactory.hxx>