10 files changed, 28 insertions, 21 deletions
diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index 77ef0ace16c1..7c1d26d3a0aa 100644
--- a/include/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
@@ -20,14 +20,16 @@
 #ifndef INCLUDED_COMPHELPER_UNWRAPARGS_HXX
 #define INCLUDED_COMPHELPER_UNWRAPARGS_HXX
 
+#include <sal/config.h>
+
+#include <boost/optional.hpp>
+
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <cppu/unotype.hxx>
 
-namespace boost { template <class T> class optional; }
-
 namespace comphelper {
 
 /// @internal
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 368fae70a633..12b4b0b28398 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -22,6 +22,9 @@
 
 #include <memory>
 #include <vector>
+
+#include <boost/optional.hpp>
+
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -41,7 +44,6 @@
 #include <vcl/errcode.hxx>
 #include <functional>
 
-namespace boost { template <class T> class optional; }
 template <typename Arg, typename Ret> class Link;
 
 namespace com { namespace sun { namespace star {
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index efe56823e1c9..51bdd1917e35 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -25,6 +25,8 @@
 #include <memory>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
@@ -46,10 +48,6 @@
 #include <vcl/graph.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace boost {
-    template <class T> class optional;
-}
-
 namespace com { namespace sun { namespace star {
     namespace awt { struct Size; }
     namespace drawing { class XShape; }
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index a372360f6d8d..967c395433ff 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_SAX_TOOLS_CONVERTER_HXX
 #define INCLUDED_SAX_TOOLS_CONVERTER_HXX
 
+#include <sal/config.h>
+
+#include <boost/optional.hpp>
+
 #include <sax/saxdllapi.h>
 
 #include <sal/types.h>
@@ -28,8 +32,6 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <tools/color.hxx>
 
-namespace boost { template <class T> class optional; }
-
 namespace com { namespace sun { namespace star {
     namespace uno {
         class Any;
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 4bf493915b2d..5ea17a412915 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -54,7 +54,8 @@
 #include <memory>
 #include <vector>
 
-namespace boost { template <class T> class optional; }
+#include <boost/optional.hpp>
+
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } }
 
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 9279f864cfdc..87ce484533c3 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -27,8 +27,9 @@
 #include <unotools/options.hxx>
 #include <memory>
 
+#include <boost/optional.hpp>
+
 namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace boost { template <class T> class optional; }
 
 // The method GetList() returns a list of property values.
 // Use follow defines to separate values by names.
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 75894432f05d..1f879b188c18 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -29,15 +29,12 @@
 #include <memory>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 class BitmapEx;
 class LanguageTag;
 class SvtSysLocale;
 
-namespace boost
-{
-    template<typename T> class optional;
-}
-
 class LocaleDataWrapper;
 struct ImplMouseData;
 struct ImplMiscData;
diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx
index e205ed1d801e..3fb0e28d1568 100644
--- a/sc/inc/sheetevents.hxx
+++ b/sc/inc/sheetevents.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <memory>
 
-namespace boost { template <class T> class optional; }
+#include <boost/optional.hpp>
 
 enum class ScSheetEventId {
     FOCUS, UNFOCUS, SELECT, DOUBLECLICK, RIGHTCLICK, CHANGE, CALCULATE, COUNT,
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index a08262eedf54..2fe6602a9fa7 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -20,13 +20,15 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATAPILOT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXPORTDATAPILOT_HXX
 
+#include <sal/config.h>
+
+#include <boost/optional.hpp>
+
 #include <rtl/ustring.hxx>
 #include <global.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <unotools/textsearch.hxx>
 
-namespace boost { template <class T> class optional; }
-
 class ScXMLExport;
 class ScDocument;
 class ScDPSaveDimension;
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index 00a109b311a4..f965ded0e605 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -11,12 +11,14 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_RANDOMNUMBERGENERATORDIALOG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_RANDOMNUMBERGENERATORDIALOG_HXX
 
+#include <sal/config.h>
+
+#include <boost/optional.hpp>
+
 #include <address.hxx>
 #include "anyrefdg.hxx"
 #include "viewdata.hxx"
 
-namespace boost { template <typename T> class optional; }
-
 class ScRandomNumberGeneratorDialog : public ScAnyRefDlgController
 {
 public: