octree.hxx is private to vcl

Change-Id: I3cb377cfa99914fdba00504fb7d955e088bfca76

vcl/inc/impoct.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_IMPOCT_HXX
 #define INCLUDED_VCL_INC_IMPOCT_HXX
 
-#include <vcl/octree.hxx>
+#include "octree.hxx"
 
 // ----------------
 // - ImpErrorQuad -

include/vcl/octree.hxx → vcl/inc/octree.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OCTREE_HXX
-#define INCLUDED_VCL_OCTREE_HXX
+#ifndef INCLUDED_VCL_INC_OCTREE_HXX
+#define INCLUDED_VCL_INC_OCTREE_HXX
 
 #include <vcl/salbtype.hxx>
 #include <vcl/dllapi.h>
@@ -122,6 +122,6 @@ inline sal_uInt16 InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColo
                  ( (sal_uLong) rColor.GetBlue() >> nBits ) ];
 }
 
-#endif // INCLUDED_VCL_OCTREE_HXX
+#endif // INCLUDED_VCL_INC_OCTREE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/source/gdi/bitmap3.cxx

@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include <math.h>
 #include <stdlib.h>
 
 #include <vcl/bmpacc.hxx>
-#include <vcl/octree.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmap.hxx>
 
 #include <impoct.hxx>
 #include <impvect.hxx>
-#include <math.h>
+
+#include "octree.hxx"
 
 #define RGB15( _def_cR, _def_cG, _def_cB )  (((sal_uLong)(_def_cR)<<10UL)|((sal_uLong)(_def_cG)<<5UL)|(sal_uLong)(_def_cB))
 #define GAMMA( _def_cVal, _def_InvGamma )   ((sal_uInt8)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L))

vcl/source/gdi/octree.cxx

@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <limits.h>
 
 #include <vcl/bmpacc.hxx>
-#include <vcl/octree.hxx>
 
 #include <impoct.hxx>
 
+#include "octree.hxx"
+
 // ---------
 // - pMask -
 // ---------