9 files changed, 10 insertions, 38 deletions
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index fad6da48c020..c30bd0846875 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -30,7 +30,7 @@
 #ifndef BIB_HRC
 #define BIB_HRC
 
-#include <extensio.hrc>
+#include "bibliography.hrc"
 
 #ifndef RID_BIB_START
 #define RID_BIB_START                   RID_EXTENSIONS_START
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 77d9858f028d..464a45ca3e76 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -32,17 +32,13 @@
 #include "precompiled_extensions.hxx"
 #include <osl/mutex.hxx>
 #include <tools/urlobj.hxx>
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
-#ifndef EXTENSIONS_INC_EXTENSIO_HRC
-#include "extensio.hrc"
-#endif
+#include "bibliography.hrc"
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 0c47c2917e46..5a95f61f50c1 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -80,20 +80,14 @@
 #include "bibview.hxx"
 // #100312# ---------
 #include "bibbeam.hxx"
-#ifndef _BIB_FMPROP_HRC
 #include "bibprop.hrc"
-#endif
 #include "toolbar.hxx"
 #include "toolbar.hrc"
 #include "bibconfig.hxx"
 #include "bibbeam.hxx"
-#ifndef BIB_HRC
 #include "bib.hrc"
-#endif
 #include "datman.hrc"
-#ifndef EXTENSIONS_INC_EXTENSIO_HRC
-#include "extensio.hrc"
-#endif
+#include "bibliography.hrc"
 #include <connectivity/dbtools.hxx>
 
 using namespace ::com::sun::star;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 6f9826153fc8..5dc410db4c59 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -42,18 +42,12 @@
 #include "framectr.hxx"
 #include "datman.hxx"
 #include "bibresid.hxx"
-#ifndef BIB_HRC
 #include "bib.hrc"
-#endif
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include "bibconfig.hxx"
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include <vcl/svapp.hxx>
-#ifndef EXTENSIONS_INC_EXTENSIO_HRC
-#include <extensio.hrc>
-#endif
+#include "bibliography.hrc"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/form/XFormController.hpp>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 293c3af7b186..62efe9127641 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -40,28 +40,18 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/form/ListSourceType.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include "general.hxx"
 #include "sections.hrc"
 #include "bibresid.hxx"
 #include "datman.hxx"
 #include "bibconfig.hxx"
-#ifndef _BIB_FMPROP_HRC
 #include "bibprop.hrc"
-#endif
-#ifndef BIB_HRC
 #include "bib.hrc"
-#endif
 #include "bibmod.hxx"
-#ifndef BIBTOOLS_HXX
 #include "bibtools.hxx"
-#endif
-#ifndef EXTENSIONS_INC_EXTENSIO_HRC
-#include "extensio.hrc"
-#endif
+#include "bibliography.hrc"
 #include <tools/debug.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
@@ -69,9 +59,7 @@
 #include <vcl/mnemonic.hxx>
 #include <algorithm>
 #include <functional>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/extensions/source/bibliography/hidother.src b/extensions/source/bibliography/hidother.src
index b0dbac415a31..82111c538094 100644
--- a/extensions/source/bibliography/hidother.src
+++ b/extensions/source/bibliography/hidother.src
@@ -27,8 +27,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "..\..\inc\extensio.hrc"           // HID_FUNC_XXX
-//#include "hidother.hrc"
+
+#include "bibliography.hrc"
 
 hidspecial HID_BIB_IDENTIFIER_POS                   { HelpID = HID_BIB_IDENTIFIER_POS          ; };
 hidspecial HID_BIB_AUTHORITYTYPE_POS                { HelpID = HID_BIB_AUTHORITYTYPE_POS       ; };
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index 6b68a97afa3d..1db38bcb647b 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -36,7 +36,7 @@
 #ifndef _GLOBALACC_SRC
 #include <svx/globlac.hrc>
 #endif
-#include <extensio.hrc>
+#include "bibliography.hrc"
 
 #include "bib.hrc"
 
diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src
index b6fd032d5f4e..ea9d5f3412e3 100644
--- a/extensions/source/bibliography/sections.src
+++ b/extensions/source/bibliography/sections.src
@@ -30,7 +30,7 @@
 //#pragma CHARSET_ANSI
 
 #include "sections.hrc"
-#include "extensio.hrc"
+#include "bibliography.hrc"
 
 #define FT_POS          12
 #define FTSIZE_LEFT     88
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index 49154b69a3c0..a291a11e25bd 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 #include <svx/svxids.hrc>
-#include "extensio.hrc"
+#include "bibliography.hrc"
 #include "toolbar.hrc"
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };