fix includes that are not stand-alone

includes should be able to be included on their own
fix some of the ones that do not respect
that rule.

Change-Id: Id161224a1978461d3cea43252f232f18888a4f61
Reviewed-on: https://gerrit.libreoffice.org/19612Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

include/LibreOfficeKit/LibreOfficeKit.hxx

@@ -11,6 +11,7 @@
 #define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
 
 #include "LibreOfficeKit.h"
+#include "LibreOfficeKitInit.h"
 
 /*
  * The reasons this C++ code is not as pretty as it could be are:

include/basebmp/basebmpdllapi.h

@@ -20,6 +20,8 @@
 #ifndef INCLUDED_BASEBMP_BASEBMPDLLAPI_H
 #define INCLUDED_BASEBMP_BASEBMPDLLAPI_H
 
+#include <sal/types.h>
+
 #if defined BASEBMP_DLLIMPLEMENTATION
 #define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
 #else

include/basegfx/raster/bzpixelraster.hxx

@@ -22,6 +22,7 @@
 
 #include <basegfx/raster/bpixelraster.hxx>
 #include <basegfx/basegfxdllapi.h>
+#include <osl/diagnose.h>
 
 namespace basegfx
 {

include/basic/sbxcore.hxx

@@ -20,11 +20,11 @@
 #ifndef INCLUDED_BASIC_SBXCORE_HXX
 #define INCLUDED_BASIC_SBXCORE_HXX
 
-#include <tools/rtti.hxx>
-#include <tools/ref.hxx>
-
-#include <basic/sbxdef.hxx>
 #include <basic/basicdllapi.h>
+#include <basic/sbxdef.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
+#include <tools/rtti.hxx>
 
 class SvStream;
 

include/canvas/base/canvascustomspritehelper.hxx

@@ -20,14 +20,15 @@
 #ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
 #define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
 
-#include <com/sun/star/rendering/XCustomSprite.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/vector/b2dvector.hxx>
 #include <canvas/base/spritesurface.hxx>
 #include <canvas/canvastoolsdllapi.h>
+#include <com/sun/star/rendering/XCustomSprite.hpp>
+#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
 namespace canvas
 {

include/canvas/base/disambiguationhelper.hxx

@@ -20,6 +20,7 @@
 #ifndef INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
 #define INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
 
+#include <com/sun/star/lang/EventObject.hpp>
 #include <osl/mutex.hxx>
 
 

include/canvas/rendering/icachedprimitive.hxx

@@ -20,6 +20,7 @@
 #ifndef INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
 #define INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
 
+#include <com/sun/star/rendering/Viewstate.hpp>
 #include <sal/types.h>
 
 #include <memory>

include/connectivity/SQLStatementHelper.hxx

@@ -22,6 +22,7 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <rtl/ustrbuf.hxx>
 
 namespace dbtools
 {

include/connectivity/StdTypeDefs.hxx

@@ -19,18 +19,17 @@
 #ifndef INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
 #define INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
 
-#include <sal/config.h>
-
 #include <map>
 #include <vector>
-#include <sal/types.h>
+
+#include <rtl/ustring.hxx>
 
 
 namespace connectivity
 {
     typedef ::std::vector< OUString>         TStringVector;
-    typedef ::std::vector< sal_Int32>               TIntVector;
-    typedef ::std::map<sal_Int32,sal_Int32>         TInt2IntMap;
+    typedef ::std::vector< sal_Int32>        TIntVector;
+    typedef ::std::map<sal_Int32,sal_Int32>  TInt2IntMap;
     typedef ::std::map< OUString,sal_Int32>  TString2IntMap;
     typedef ::std::map< sal_Int32,OUString>  TInt2StringMap;
 }

include/drawinglayer/processor2d/canvasprocessor.hxx

@@ -20,17 +20,17 @@
 #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX
 #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX
 
-#include <drawinglayer/drawinglayerdllapi.h>
-
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
-#include <svtools/optionsdrawinglayer.hxx>
-#include <com/sun/star/rendering/ViewState.hpp>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <drawinglayer/drawinglayerdllapi.h>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <i18nlangtag/lang.h>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <svtools/optionsdrawinglayer.hxx>
 #include <vcl/mapmod.hxx>
+#include <vcl/vclptr.hxx>
 
 namespace basegfx {
     class BColor;

include/editeng/eedata.hxx

@@ -25,6 +25,8 @@
 // later.
 #include <vector>
 
+#include <sal/types.h>
+
 namespace EEngineData
 {
     // spell checking wrong vector containing the redlining data

include/filter/msfilter/msocximex.hxx

@@ -19,6 +19,7 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 #define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 
+#include <com/sun/star/uno/Reference.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
 
 namespace com{namespace sun{namespace star{

include/filter/msfilter/svdfppt.hxx

@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
 #define INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
 
+#include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <tools/gen.hxx>

include/filter/msfilter/svxmsbas.hxx

@@ -20,14 +20,16 @@
 #ifndef INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX
 #define INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX
 
-#include <tools/solar.h>
-#include <filter/msfilter/msfilterdllapi.h>
-
 #include <map>
 #include <unordered_map>
 
+#include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sot/storage.hxx>
+#include <tools/solar.h>
+#include <tools/ref.hxx>
+
 class SfxObjectShell;
-class SotStorage;
 
 /* Construct with the root storage of the MS document, with bImportCode
  * set the visual basic code will be imported into the stardocument when Import

include/formula/IControlReferenceHandler.hxx

@@ -20,6 +20,7 @@
 #define INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX
 
 #include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
 
 namespace formula
 {

include/jvmaccess/unovirtualmachine.hxx

@@ -21,14 +21,13 @@
 #define INCLUDED_JVMACCESS_UNOVIRTUALMACHINE_HXX
 
 #include <jvmaccess/jvmaccessdllapi.h>
+#include <jvmaccess/virtualmachine.hxx>
 #include <sal/config.h>
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ref.hxx>
 
 namespace jvmaccess {
 
-class VirtualMachine;
-
 /** An encapsulating wrapper around a Java virtual machine and an appropriate
     UNO class loader.
  */

include/oox/export/utils.hxx

@@ -20,6 +20,8 @@
 #ifndef INCLUDED_OOX_EXPORT_UTILS_HXX
 #define INCLUDED_OOX_EXPORT_UTILS_HXX
 
+#include <rtl/ustring.hxx>
+
 #define I32S(x) OString::number( (sal_Int32) x ).getStr()
 #define I64S(x) OString::number( (sal_Int64) x ).getStr()
 #define IS(x) OString::number( x ).getStr()

include/svx/globl3d.hxx

@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_GLOBL3D_HXX
 #define INCLUDED_SVX_GLOBL3D_HXX
 
+#include <sal/types.h>
+
 const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+
                            sal_uInt32('3')*0x00000100+
                            sal_uInt32('D')*0x00010000+

include/tools/appendunixshellword.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX
 #define INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX
 
-#include <sal/config.h>
+#include <rtl/strbuf.hxx>
 
 #if defined UNX
 #include <tools/toolsdllapi.h>

include/tools/getprocessworkingdir.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_TOOLS_GETPROCESSWORKINGDIR_HXX
 #define INCLUDED_TOOLS_GETPROCESSWORKINGDIR_HXX
 
-#include <sal/config.h>
+#include <rtl/ustring.hxx>
 #include <tools/toolsdllapi.h>
 
 

include/tools/mapunit.hxx

@@ -20,6 +20,8 @@
 #ifndef INCLUDED_TOOLS_MAPUNIT_HXX
 #define INCLUDED_TOOLS_MAPUNIT_HXX
 
+#include <sal/types.h>
+
 enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
                MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
                MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,

include/unotest/gettestargument.hxx

@@ -20,8 +20,7 @@
 #ifndef INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
 #define INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
 
-#include <sal/config.h>
-
+#include <rtl/ustring.hxx>
 #include <unotest/detail/unotestdllapi.hxx>
 
 

include/unotest/toabsolutefileurl.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX
 #define INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX
 
-#include <sal/config.h>
+#include <rtl/ustring.hxx>
 
 #include <unotest/detail/unotestdllapi.hxx>
 

include/vcl/fontcapabilities.hxx

@@ -13,6 +13,8 @@
 #include <boost/dynamic_bitset.hpp>
 #include <vector>
 
+#include <sal/types.h>
+
 //See OS/2 table, i.e. http://www.microsoft.com/typography/otspec/os2.htm#ur
 namespace vcl
 {

include/vcl/salgtype.hxx

@@ -20,6 +20,8 @@
 #ifndef INCLUDED_VCL_SALGTYPE_HXX
 #define INCLUDED_VCL_SALGTYPE_HXX
 
+#include <sal/types.h>
+
 typedef sal_uInt32 SalColor;
 #define MAKE_SALCOLOR( r, g, b )    ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16))
 #define SALCOLOR_RED( n )           ((sal_uInt8)((n)>>16))

include/xmloff/DashStyle.hxx

@@ -20,9 +20,8 @@
 #ifndef INCLUDED_XMLOFF_DASHSTYLE_HXX
 #define INCLUDED_XMLOFF_DASHSTYLE_HXX
 
-#include <sal/config.h>
+#include <rtl/ustring.hxx>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 
 class SvXMLImport;
 class SvXMLExport;

include/xmloff/styleexp.hxx

@@ -21,6 +21,7 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
+#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 

include/xmloff/xmlcnimp.hxx

@@ -20,10 +20,11 @@
 #ifndef INCLUDED_XMLOFF_XMLCNIMP_HXX
 #define INCLUDED_XMLOFF_XMLCNIMP_HXX
 
-#include <xmloff/dllapi.h>
-#include <sal/types.h>
 #include <memory>
 
+#include <rtl/ustring.hxx>
+#include <xmloff/dllapi.h>
+
 class SvXMLAttrCollection;
 
 class XMLOFF_DLLPUBLIC SvXMLAttrContainerData