basebmp: these headers are not used from other modules

Change-Id: I88c5c341b88a6ea62730e5d3dd1962365c531f70

30 files changed, 150 insertions, 145 deletions

diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 12a2dec1eb3e..809671c97c55 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_Library_Library,basebmp))
 
 $(eval $(call gb_Library_use_sdk_api,basebmp))
 
+$(eval $(call gb_Library_set_include,basebmp,\
+	-I$(SRCDIR)/basebmp/inc \
+	$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_externals,basebmp,\
 	boost_headers \
 	vigra_headers \
diff --git a/include/basebmp/accessor.hxx b/basebmp/inc/accessor.hxx
index b77af908a0de..828d8feafdc7 100644
--- a/include/basebmp/accessor.hxx
+++ b/basebmp/inc/accessor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_ACCESSOR_HXX
-#define INCLUDED_BASEBMP_ACCESSOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSOR_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSOR_HXX
 
 #include <vigra/numerictraits.hxx>
 
@@ -108,6 +108,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_ACCESSOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/accessoradapters.hxx b/basebmp/inc/accessoradapters.hxx
index 0d0122e5c7d2..86805653e935 100644
--- a/include/basebmp/accessoradapters.hxx
+++ b/basebmp/inc/accessoradapters.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX
-#define INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSORADAPTERS_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSORADAPTERS_HXX
 
 #include <vigra/numerictraits.hxx>
 
@@ -515,6 +515,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSORADAPTERS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/accessorfunctors.hxx b/basebmp/inc/accessorfunctors.hxx
index 02e3abaded95..cae37ba7ad78 100644
--- a/include/basebmp/accessorfunctors.hxx
+++ b/basebmp/inc/accessorfunctors.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX
-#define INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSORFUNCTORS_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSORFUNCTORS_HXX
 
 #include <osl/diagnose.h>
-#include <basebmp/metafunctions.hxx>
+#include <metafunctions.hxx>
 
 #include <functional>
 
@@ -176,6 +176,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSORFUNCTORS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/accessortraits.hxx b/basebmp/inc/accessortraits.hxx
index c8f45a0541e5..6ca8893ff440 100644
--- a/include/basebmp/accessortraits.hxx
+++ b/basebmp/inc/accessortraits.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
-#define INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ACCESSORTRAITS_HXX
+#define INCLUDED_BASEBMP_INC_ACCESSORTRAITS_HXX
 
-#include <basebmp/accessorfunctors.hxx>
-#include <basebmp/accessoradapters.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <accessorfunctors.hxx>
+#include <accessoradapters.hxx>
+#include <metafunctions.hxx>
 
 namespace basebmp
 {
@@ -125,6 +125,6 @@ template< class Accessor > struct AccessorTraits
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_ACCESSORTRAITS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ACCESSORTRAITS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/clippedlinerenderer.hxx b/basebmp/inc/clippedlinerenderer.hxx
index 0265a65ee1bb..e8638720e8c6 100644
--- a/include/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/clippedlinerenderer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
-#define INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
+#ifndef INCLUDED_BASEBMP_INC_CLIPPEDLINERENDERER_HXX
+#define INCLUDED_BASEBMP_INC_CLIPPEDLINERENDERER_HXX
 
 #include <basegfx/tools/rectcliptools.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -433,6 +433,6 @@ void renderClippedLine( basegfx::B2IPoint             aPt1,
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX */
+#endif /* INCLUDED_BASEBMP_INC_CLIPPEDLINERENDERER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/colorblendaccessoradapter.hxx
index 59055b06fe0a..b9465fb4a584 100644
--- a/include/basebmp/colorblendaccessoradapter.hxx
+++ b/basebmp/inc/colorblendaccessoradapter.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
-#define INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
+#ifndef INCLUDED_BASEBMP_INC_COLORBLENDACCESSORADAPTER_HXX
+#define INCLUDED_BASEBMP_INC_COLORBLENDACCESSORADAPTER_HXX
 
-#include <basebmp/colortraits.hxx>
+#include <colortraits.hxx>
 
 namespace basebmp
 {
@@ -137,6 +137,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COLORBLENDACCESSORADAPTER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/colormisc.hxx b/basebmp/inc/colormisc.hxx
index dc269a043bc7..5d38b930a1eb 100644
--- a/include/basebmp/colormisc.hxx
+++ b/basebmp/inc/colormisc.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_COLORMISC_HXX
-#define INCLUDED_BASEBMP_COLORMISC_HXX
+#ifndef INCLUDED_BASEBMP_INC_COLORMISC_HXX
+#define INCLUDED_BASEBMP_INC_COLORMISC_HXX
 
 #include <osl/diagnose.h>
 #include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessortraits.hxx>
+#include <colortraits.hxx>
+#include <accessortraits.hxx>
 #include <vigra/mathutil.hxx>
 
 // Contents of this header moved out of color.hxx, as it is not useful
@@ -168,6 +168,6 @@ struct NumericTraits<basebmp::Color>
 
 } // namespace vigra
 
-#endif /* INCLUDED_BASEBMP_COLORMISC_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COLORMISC_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/colortraits.hxx b/basebmp/inc/colortraits.hxx
index d9b43320a58b..5a54645dc05a 100644
--- a/include/basebmp/colortraits.hxx
+++ b/basebmp/inc/colortraits.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_COLORTRAITS_HXX
-#define INCLUDED_BASEBMP_COLORTRAITS_HXX
+#ifndef INCLUDED_BASEBMP_INC_COLORTRAITS_HXX
+#define INCLUDED_BASEBMP_INC_COLORTRAITS_HXX
 
-#include <basebmp/accessoradapters.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <accessoradapters.hxx>
+#include <metafunctions.hxx>
 
 #include <vigra/mathutil.hxx>
 
@@ -132,6 +132,6 @@ template< typename ColorType > struct ColorTraits
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_COLORTRAITS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COLORTRAITS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/compositeiterator.hxx b/basebmp/inc/compositeiterator.hxx
index 182318160483..2db654aa093d 100644
--- a/include/basebmp/compositeiterator.hxx
+++ b/basebmp/inc/compositeiterator.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX
-#define INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_COMPOSITEITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_COMPOSITEITERATOR_HXX
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
 
-#include <basebmp/nonstandarditerator.hxx>
+#include <nonstandarditerator.hxx>
 #include <vigra/tuple.hxx>
 #include <vigra/iteratortraits.hxx>
 
@@ -390,6 +390,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_COMPOSITEITERATOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/endian.hxx b/basebmp/inc/endian.hxx
index 22c32b6077ac..a924f5a71a86 100644
--- a/include/basebmp/endian.hxx
+++ b/basebmp/inc/endian.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_ENDIAN_HXX
-#define INCLUDED_BASEBMP_ENDIAN_HXX
+#ifndef INCLUDED_BASEBMP_INC_ENDIAN_HXX
+#define INCLUDED_BASEBMP_INC_ENDIAN_HXX
 
 #include <osl/endian.h>
 
@@ -46,6 +46,6 @@ BASEBMP_BYTE_SWAP(sal_uInt32,OSL_SWAPDWORD)
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_ENDIAN_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ENDIAN_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/fillimage.hxx b/basebmp/inc/fillimage.hxx
index 561b02906c0f..7acd901edacb 100644
--- a/include/basebmp/fillimage.hxx
+++ b/basebmp/inc/fillimage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_FILLIMAGE_HXX
-#define INCLUDED_BASEBMP_FILLIMAGE_HXX
+#ifndef INCLUDED_BASEBMP_INC_FILLIMAGE_HXX
+#define INCLUDED_BASEBMP_INC_FILLIMAGE_HXX
 
 #include <vigra/tuple.hxx>
 #include <vigra/iteratortraits.hxx>
@@ -58,6 +58,6 @@ inline void fillImage( vigra::triple<DestIterator,DestIterator,DestAccessor> con
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_FILLIMAGE_HXX */
+#endif /* INCLUDED_BASEBMP_INC_FILLIMAGE_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/genericcolorimageaccessor.hxx b/basebmp/inc/genericcolorimageaccessor.hxx
index 6d7cd531f58b..3db0fde8adf9 100644
--- a/include/basebmp/genericcolorimageaccessor.hxx
+++ b/basebmp/inc/genericcolorimageaccessor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX
-#define INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_GENERICCOLORIMAGEACCESSOR_HXX
+#define INCLUDED_BASEBMP_INC_GENERICCOLORIMAGEACCESSOR_HXX
 
 #include <basebmp/color.hxx>
 #include <basebmp/bitmapdevice.hxx>
@@ -71,6 +71,6 @@ namespace basebmp
     };
 }
 
-#endif /* INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_GENERICCOLORIMAGEACCESSOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/greylevelformats.hxx b/basebmp/inc/greylevelformats.hxx
index 705c26d7d506..a758fa941047 100644
--- a/include/basebmp/greylevelformats.hxx
+++ b/basebmp/inc/greylevelformats.hxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX
-#define INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_GREYLEVELFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_GREYLEVELFORMATS_HXX
 
 #include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/packedpixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <colortraits.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <packedpixeliterator.hxx>
+#include <pixelformatadapters.hxx>
+#include <metafunctions.hxx>
 
 #include <vigra/numerictraits.hxx>
 #include <vigra/metaprogramming.hxx>
@@ -124,6 +124,6 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY8::getter_type,
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_GREYLEVELFORMATS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/iteratortraits.hxx b/basebmp/inc/iteratortraits.hxx
index 5d87df7d5a85..a0b65f5e20eb 100644
--- a/include/basebmp/iteratortraits.hxx
+++ b/basebmp/inc/iteratortraits.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_ITERATORTRAITS_HXX
-#define INCLUDED_BASEBMP_ITERATORTRAITS_HXX
+#ifndef INCLUDED_BASEBMP_INC_ITERATORTRAITS_HXX
+#define INCLUDED_BASEBMP_INC_ITERATORTRAITS_HXX
 
-#include <basebmp/accessor.hxx>
-#include <basebmp/nonstandarditerator.hxx>
+#include <accessor.hxx>
+#include <nonstandarditerator.hxx>
 
 namespace basebmp
 {
@@ -44,6 +44,6 @@ template< class Iterator > struct IteratorTraits
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_ITERATORTRAITS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_ITERATORTRAITS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/metafunctions.hxx b/basebmp/inc/metafunctions.hxx
index 1f3f1806042a..16ee2615f4d7 100644
--- a/include/basebmp/metafunctions.hxx
+++ b/basebmp/inc/metafunctions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_METAFUNCTIONS_HXX
-#define INCLUDED_BASEBMP_METAFUNCTIONS_HXX
+#ifndef INCLUDED_BASEBMP_INC_METAFUNCTIONS_HXX
+#define INCLUDED_BASEBMP_INC_METAFUNCTIONS_HXX
 
 #include <boost/mpl/integral_c.hpp>
 #include <vigra/metaprogramming.hxx>
@@ -212,6 +212,6 @@ template< typename T > inline T shiftRight( T v, int shift )
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_METAFUNCTIONS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_METAFUNCTIONS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/nonstandarditerator.hxx b/basebmp/inc/nonstandarditerator.hxx
index ff51c59afcee..fbf9683c2af7 100644
--- a/include/basebmp/nonstandarditerator.hxx
+++ b/basebmp/inc/nonstandarditerator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
-#define INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_NONSTANDARDITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_NONSTANDARDITERATOR_HXX
 
 #include <vigra/metaprogramming.hxx>
 
@@ -34,6 +34,6 @@ namespace basebmp
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_NONSTANDARDITERATOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/packedpixeliterator.hxx b/basebmp/inc/packedpixeliterator.hxx
index a536cec01012..b7bcac09487b 100644
--- a/include/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/packedpixeliterator.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX
-#define INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_PACKEDPIXELITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_PACKEDPIXELITERATOR_HXX
 
-#include <basebmp/metafunctions.hxx>
-#include <basebmp/stridedarrayiterator.hxx>
-#include <basebmp/nonstandarditerator.hxx>
-#include <basebmp/accessortraits.hxx>
+#include <metafunctions.hxx>
+#include <stridedarrayiterator.hxx>
+#include <nonstandarditerator.hxx>
+#include <accessortraits.hxx>
 
 #include <vigra/metaprogramming.hxx>
 #include <vigra/diff2d.hxx>
@@ -665,6 +665,6 @@ template< class Accessor,
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PACKEDPIXELITERATOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/paletteformats.hxx b/basebmp/inc/paletteformats.hxx
index 083164cd5ea6..f42424cdae44 100644
--- a/include/basebmp/paletteformats.hxx
+++ b/basebmp/inc/paletteformats.hxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_PALETTEFORMATS_HXX
-#define INCLUDED_BASEBMP_PALETTEFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_PALETTEFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_PALETTEFORMATS_HXX
 
 #include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/packedpixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
-#include <basebmp/paletteimageaccessor.hxx>
-#include <basebmp/metafunctions.hxx>
+#include <colortraits.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <packedpixeliterator.hxx>
+#include <pixelformatadapters.hxx>
+#include <paletteimageaccessor.hxx>
+#include <metafunctions.hxx>
 
 #include <vigra/numerictraits.hxx>
 #include <vigra/metaprogramming.hxx>
@@ -134,6 +134,6 @@ typedef PixelFormatTraitsTemplate_Palette<
 
 } // namespace basebmp
 
-#endif // INCLUDED_BASEBMP_PALETTEFORMATS_HXX
+#endif // INCLUDED_BASEBMP_INC_PALETTEFORMATS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/paletteimageaccessor.hxx b/basebmp/inc/paletteimageaccessor.hxx
index d19cd0344e32..85d54885cf69 100644
--- a/include/basebmp/paletteimageaccessor.hxx
+++ b/basebmp/inc/paletteimageaccessor.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX
-#define INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_PALETTEIMAGEACCESSOR_HXX
+#define INCLUDED_BASEBMP_INC_PALETTEIMAGEACCESSOR_HXX
 
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessortraits.hxx>
+#include <colortraits.hxx>
+#include <accessortraits.hxx>
 
 #include <vigra/numerictraits.hxx>
 #include <vigra/metaprogramming.hxx>
@@ -157,6 +157,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PALETTEIMAGEACCESSOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/pixelformatadapters.hxx b/basebmp/inc/pixelformatadapters.hxx
index 3789b7eb0360..9a6a11d7d8bb 100644
--- a/include/basebmp/pixelformatadapters.hxx
+++ b/basebmp/inc/pixelformatadapters.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX
-#define INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX
+#ifndef INCLUDED_BASEBMP_INC_PIXELFORMATADAPTERS_HXX
+#define INCLUDED_BASEBMP_INC_PIXELFORMATADAPTERS_HXX
 
-#include <basebmp/accessortraits.hxx>
-#include <basebmp/accessoradapters.hxx>
+#include <accessortraits.hxx>
+#include <accessoradapters.hxx>
 
 #include <vigra/metaprogramming.hxx>
 
@@ -97,6 +97,6 @@ template< class Accessor > struct AccessorTraits<                 \
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PIXELFORMATADAPTERS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/pixeliterator.hxx b/basebmp/inc/pixeliterator.hxx
index e629af275dd9..d38af98ca668 100644
--- a/include/basebmp/pixeliterator.hxx
+++ b/basebmp/inc/pixeliterator.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_PIXELITERATOR_HXX
-#define INCLUDED_BASEBMP_PIXELITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_PIXELITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_PIXELITERATOR_HXX
 
-#include <basebmp/metafunctions.hxx>
-#include <basebmp/stridedarrayiterator.hxx>
+#include <metafunctions.hxx>
+#include <stridedarrayiterator.hxx>
 
 #include <vigra/metaprogramming.hxx>
 #include <vigra/diff2d.hxx>
@@ -344,6 +344,6 @@ public:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_PIXELITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_PIXELITERATOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/polypolygonrenderer.hxx b/basebmp/inc/polypolygonrenderer.hxx
index 05860da2d63e..fef2f7f9a321 100644
--- a/include/basebmp/polypolygonrenderer.hxx
+++ b/basebmp/inc/polypolygonrenderer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
-#define INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
+#ifndef INCLUDED_BASEBMP_INC_POLYPOLYGONRENDERER_HXX
+#define INCLUDED_BASEBMP_INC_POLYPOLYGONRENDERER_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -350,6 +350,6 @@ namespace basebmp
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX */
+#endif /* INCLUDED_BASEBMP_INC_POLYPOLYGONRENDERER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/rgb24pixelformats.hxx b/basebmp/inc/rgb24pixelformats.hxx
index 50c110a0dfd9..6b7edd75a182 100644
--- a/include/basebmp/rgb24pixelformats.hxx
+++ b/basebmp/inc/rgb24pixelformats.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX
-#define INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_RGB24PIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_RGB24PIXELFORMATS_HXX
 
 #include <basebmp/color.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <pixelformatadapters.hxx>
 
 #include <vigra/rgbvalue.hxx>
 
@@ -87,6 +87,6 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR24::getter_type,
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_RGB24PIXELFORMATS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/rgbmaskpixelformats.hxx
index 262b17ea983b..63068826e04f 100644
--- a/include/basebmp/rgbmaskpixelformats.hxx
+++ b/basebmp/inc/rgbmaskpixelformats.hxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX
-#define INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX
+#ifndef INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX
 
 #include <basebmp/color.hxx>
-#include <basebmp/colortraits.hxx>
-#include <basebmp/accessor.hxx>
-#include <basebmp/pixeliterator.hxx>
-#include <basebmp/pixelformatadapters.hxx>
-#include <basebmp/metafunctions.hxx>
-#include <basebmp/endian.hxx>
+#include <colortraits.hxx>
+#include <accessor.hxx>
+#include <pixeliterator.hxx>
+#include <pixelformatadapters.hxx>
+#include <metafunctions.hxx>
+#include <endian.hxx>
 
 #include <vigra/numerictraits.hxx>
 #include <vigra/metaprogramming.hxx>
@@ -350,6 +350,6 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGRX32_8888::getter_type,
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/scaleimage.hxx b/basebmp/inc/scaleimage.hxx
index fc9022357fe6..69beaf696243 100644
--- a/include/basebmp/scaleimage.hxx
+++ b/basebmp/inc/scaleimage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_SCALEIMAGE_HXX
-#define INCLUDED_BASEBMP_SCALEIMAGE_HXX
+#ifndef INCLUDED_BASEBMP_INC_SCALEIMAGE_HXX
+#define INCLUDED_BASEBMP_INC_SCALEIMAGE_HXX
 
 #include <osl/diagnose.h>
 
@@ -184,6 +184,6 @@ inline void scaleImage( vigra::triple<SourceIter,SourceIter,SourceAcc> const& sr
 
 }
 
-#endif /* INCLUDED_BASEBMP_SCALEIMAGE_HXX */
+#endif /* INCLUDED_BASEBMP_INC_SCALEIMAGE_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/stridedarrayiterator.hxx b/basebmp/inc/stridedarrayiterator.hxx
index 6f5772e527c6..821d3aa08414 100644
--- a/include/basebmp/stridedarrayiterator.hxx
+++ b/basebmp/inc/stridedarrayiterator.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX
-#define INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX
+#ifndef INCLUDED_BASEBMP_INC_STRIDEDARRAYITERATOR_HXX
+#define INCLUDED_BASEBMP_INC_STRIDEDARRAYITERATOR_HXX
 
-#include <basebmp/metafunctions.hxx>
+#include <metafunctions.hxx>
 
 namespace basebmp
 {
@@ -103,6 +103,6 @@ private:
 
 } // namespace basebmp
 
-#endif /* INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX */
+#endif /* INCLUDED_BASEBMP_INC_STRIDEDARRAYITERATOR_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basebmp/tools.hxx b/basebmp/inc/tools.hxx
index 31854a1d5e25..c562a305aaed 100644
--- a/include/basebmp/tools.hxx
+++ b/basebmp/inc/tools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEBMP_TOOLS_HXX
-#define INCLUDED_BASEBMP_TOOLS_HXX
+#ifndef INCLUDED_BASEBMP_INC_TOOLS_HXX
+#define INCLUDED_BASEBMP_INC_TOOLS_HXX
 
 #include <basegfx/range/b2ibox.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -80,6 +80,6 @@ namespace basebmp
     }
 }
 
-#endif /* INCLUDED_BASEBMP_TOOLS_HXX */
+#endif /* INCLUDED_BASEBMP_INC_TOOLS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 961f07b05463..040015e11d3d 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -24,31 +24,31 @@
 
 #include <basebmp/bitmapdevice.hxx>
 
-#include <basebmp/compositeiterator.hxx>
-#include <basebmp/iteratortraits.hxx>
+#include <compositeiterator.hxx>
+#include <iteratortraits.hxx>
 
-#include <basebmp/accessor.hxx>
-#include <basebmp/accessortraits.hxx>
-#include <basebmp/accessoradapters.hxx>
-#include <basebmp/colorblendaccessoradapter.hxx>
+#include <accessor.hxx>
+#include <accessortraits.hxx>
+#include <accessoradapters.hxx>
+#include <colorblendaccessoradapter.hxx>
 
 #include <basebmp/color.hxx>
-#include <basebmp/colormisc.hxx>
-#include <basebmp/colortraits.hxx>
+#include <colormisc.hxx>
+#include <colortraits.hxx>
 
-#include <basebmp/greylevelformats.hxx>
-#include <basebmp/paletteformats.hxx>
-#include <basebmp/rgbmaskpixelformats.hxx>
-#include <basebmp/rgb24pixelformats.hxx>
+#include <greylevelformats.hxx>
+#include <paletteformats.hxx>
+#include <rgbmaskpixelformats.hxx>
+#include <rgb24pixelformats.hxx>
 
 #include <basebmp/scanlineformats.hxx>
-#include <basebmp/fillimage.hxx>
-#include <basebmp/scaleimage.hxx>
-#include <basebmp/clippedlinerenderer.hxx>
-#include <basebmp/polypolygonrenderer.hxx>
-#include <basebmp/genericcolorimageaccessor.hxx>
+#include <fillimage.hxx>
+#include <scaleimage.hxx>
+#include <clippedlinerenderer.hxx>
+#include <polypolygonrenderer.hxx>
+#include <genericcolorimageaccessor.hxx>
 
-#include <basebmp/tools.hxx>
+#include <tools.hxx>
 #include "intconversion.hxx"
 
 #include <rtl/alloc.h>
diff --git a/basebmp/source/polypolygonrenderer.cxx b/basebmp/source/polypolygonrenderer.cxx
index 55d6d69a5d98..91cd27340bd0 100644
--- a/basebmp/source/polypolygonrenderer.cxx
+++ b/basebmp/source/polypolygonrenderer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <basebmp/polypolygonrenderer.hxx>
+#include <polypolygonrenderer.hxx>
 
 #include <algorithm>