fixincludeguards.sh: include/{toolkit,tools}

Change-Id: I5572c320431222be2405f8c2dc8adeafe4f3828b

53 files changed, 106 insertions, 106 deletions

diff --git a/include/tools/StringListResource.hxx b/include/tools/StringListResource.hxx
index dd61dadf02bc..3bd15a0cd213 100644
--- a/include/tools/StringListResource.hxx
+++ b/include/tools/StringListResource.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef TOOLS_STRINGLISTRESOURCE_HXX
-#define TOOLS_STRINGLISTRESOURCE_HXX
+#ifndef INCLUDED_TOOLS_STRINGLISTRESOURCE_HXX
+#define INCLUDED_TOOLS_STRINGLISTRESOURCE_HXX
 
 #include <vector>
 #include <tools/resid.hxx>
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index dd21aaede863..db6449cb450f 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _B3D_B3DTRANS_HXX
-#define _B3D_B3DTRANS_HXX
+#ifndef INCLUDED_TOOLS_B3DTRANS_HXX
+#define INCLUDED_TOOLS_B3DTRANS_HXX
 
 #define ZBUFFER_DEPTH_RANGE         ((double)(256L * 256L * 256L))
 
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index 95cd395ae912..019e425f1d91 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _BIGINT_HXX
-#define _BIGINT_HXX
+#ifndef INCLUDED_TOOLS_BIGINT_HXX
+#define INCLUDED_TOOLS_BIGINT_HXX
 
 #include <climits>
 #include <rtl/ustring.hxx>
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index f992c32f01d7..db901c843959 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_COLOR_HXX
-#define _TOOLS_COLOR_HXX
+#ifndef INCLUDED_TOOLS_COLOR_HXX
+#define INCLUDED_TOOLS_COLOR_HXX
 
 #include "tools/toolsdllapi.h"
 
diff --git a/include/tools/contnr.hxx b/include/tools/contnr.hxx
index 5b31f6897d77..ce567171baa2 100644
--- a/include/tools/contnr.hxx
+++ b/include/tools/contnr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _CONTNR_HXX
-#define _CONTNR_HXX
+#ifndef INCLUDED_TOOLS_CONTNR_HXX
+#define INCLUDED_TOOLS_CONTNR_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index 7933e7efe9eb..d18791e65a65 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _DATE_HXX
-#define _DATE_HXX
+#ifndef INCLUDED_TOOLS_DATE_HXX
+#define INCLUDED_TOOLS_DATE_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx
index a8d732efc510..69f55d7f187e 100644
--- a/include/tools/datetime.hxx
+++ b/include/tools/datetime.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _DATETIME_HXX
-#define _DATETIME_HXX
+#ifndef INCLUDED_TOOLS_DATETIME_HXX
+#define INCLUDED_TOOLS_DATETIME_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 445ea7e6120e..90683f00d40a 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef TOOLS_DIAGNOSE_EX_H
-#define TOOLS_DIAGNOSE_EX_H
+#ifndef INCLUDED_TOOLS_DIAGNOSE_EX_H
+#define INCLUDED_TOOLS_DIAGNOSE_EX_H
 
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx
index 884e9f09748e..df86faec68fd 100644
--- a/include/tools/errcode.hxx
+++ b/include/tools/errcode.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ERRCODE_HXX
-#define _ERRCODE_HXX
+#ifndef INCLUDED_TOOLS_ERRCODE_HXX
+#define INCLUDED_TOOLS_ERRCODE_HXX
 
 #ifndef __RSC
 #include <tools/solar.h>
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 04f03671194b..4dabe6381df1 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -19,8 +19,8 @@
 
 #ifndef __RSC
 
-#ifndef _EINF_HXX
-#define _EINF_HXX
+#ifndef INCLUDED_TOOLS_ERRINF_HXX
+#define INCLUDED_TOOLS_ERRINF_HXX
 
 #include <limits.h>
 #include <rtl/ustring.hxx>
diff --git a/include/tools/fldunit.hxx b/include/tools/fldunit.hxx
index 25c13dbafda1..65beb743a07a 100644
--- a/include/tools/fldunit.hxx
+++ b/include/tools/fldunit.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_FLDUNIT_HXX
-#define _TOOLS_FLDUNIT_HXX
+#ifndef INCLUDED_TOOLS_FLDUNIT_HXX
+#define INCLUDED_TOOLS_FLDUNIT_HXX
 
 enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
                  FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx
index 7a53e931cc1c..0d5bddb3289b 100644
--- a/include/tools/fontenum.hxx
+++ b/include/tools/fontenum.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_FONTENUM_HXX
-#define _TOOLS_FONTENUM_HXX
+#ifndef INCLUDED_TOOLS_FONTENUM_HXX
+#define INCLUDED_TOOLS_FONTENUM_HXX
 
 #include <sal/types.h>
 #include <tools/solar.h>
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index 24c6721f0fa3..ca5b9c6626ac 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _FRACT_HXX
-#define _FRACT_HXX
+#ifndef INCLUDED_TOOLS_FRACT_HXX
+#define INCLUDED_TOOLS_FRACT_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index fbfac95ec323..6146cec6e4c8 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_GEN_HXX
-#define _SV_GEN_HXX
+#ifndef INCLUDED_TOOLS_GEN_HXX
+#define INCLUDED_TOOLS_GEN_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index eb7b7e91bee2..d2602fc94683 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _GLOBNAME_HXX
-#define _GLOBNAME_HXX
+#ifndef INCLUDED_TOOLS_GLOBNAME_HXX
+#define INCLUDED_TOOLS_GLOBNAME_HXX
 
 #include <vector>
 
diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index 5a525872ae50..c3cb88f3e348 100644
--- a/include/tools/helpers.hxx
+++ b/include/tools/helpers.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _TOOLS_HELPERS_HXX
-#define _TOOLS_HELPERS_HXX
+#ifndef INCLUDED_TOOLS_HELPERS_HXX
+#define INCLUDED_TOOLS_HELPERS_HXX
 
 inline long MinMax( long nVal, long nMin, long nMax )
 {
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 40b8429a31b0..07785a816c6a 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef TOOLS_INETMIME_HXX
-#define TOOLS_INETMIME_HXX
+#ifndef INCLUDED_TOOLS_INETMIME_HXX
+#define INCLUDED_TOOLS_INETMIME_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index fe05d635f4bc..75b0c63c2321 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_INETMSG_HXX
-#define _TOOLS_INETMSG_HXX
+#ifndef INCLUDED_TOOLS_INETMSG_HXX
+#define INCLUDED_TOOLS_INETMSG_HXX
 
 #include "tools/toolsdllapi.h"
 #include <rtl/string.hxx>
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index dcf1ecd9fd97..442f1915b885 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_INETSTRM_HXX
-#define _TOOLS_INETSTRM_HXX
+#ifndef INCLUDED_TOOLS_INETSTRM_HXX
+#define INCLUDED_TOOLS_INETSTRM_HXX
 
 #include "tools/toolsdllapi.h"
 #include <sal/types.h>
diff --git a/include/tools/line.hxx b/include/tools/line.hxx
index eb3f3219aa2e..77d284166a90 100644
--- a/include/tools/line.hxx
+++ b/include/tools/line.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _LINE_HXX
-#define _LINE_HXX
+#ifndef INCLUDED_TOOLS_LINE_HXX
+#define INCLUDED_TOOLS_LINE_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/gen.hxx>
diff --git a/include/tools/lineend.hxx b/include/tools/lineend.hxx
index c24e91cf83d8..79896672aa17 100644
--- a/include/tools/lineend.hxx
+++ b/include/tools/lineend.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _LINEEND_HXX
-#define _LINEEND_HXX
+#ifndef INCLUDED_TOOLS_LINEEND_HXX
+#define INCLUDED_TOOLS_LINEEND_HXX
 
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 279c7b7fed16..45ce2fdcb304 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _LINK_HXX
-#define _LINK_HXX
+#ifndef INCLUDED_TOOLS_LINK_HXX
+#define INCLUDED_TOOLS_LINK_HXX
 
 #include "tools/toolsdllapi.h"
 #include "sal/config.h"
diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx
index 55d68911b957..b8440177db66 100644
--- a/include/tools/mapunit.hxx
+++ b/include/tools/mapunit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLS_MAPUNIT_HXX
-#define _TOOLS_MAPUNIT_HXX
+#ifndef INCLUDED_TOOLS_MAPUNIT_HXX
+#define INCLUDED_TOOLS_MAPUNIT_HXX
 
 enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
                MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
diff --git a/include/tools/mempool.hxx b/include/tools/mempool.hxx
index 3fa27ff50773..0551d9435416 100644
--- a/include/tools/mempool.hxx
+++ b/include/tools/mempool.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVMEMPOOL_HXX
-#define _SVMEMPOOL_HXX
+#ifndef INCLUDED_TOOLS_MEMPOOL_HXX
+#define INCLUDED_TOOLS_MEMPOOL_HXX
 
 #include "sal/config.h"
 
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 7e3d46325629..96e8952777b8 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_MULTISEL_HXX
-#define _SV_MULTISEL_HXX
+#ifndef INCLUDED_TOOLS_MULTISEL_HXX
+#define INCLUDED_TOOLS_MULTISEL_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/gen.hxx>
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index b2d9b7112e2d..8fa59a704d5c 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TL_POLY_HXX
-#define _TL_POLY_HXX
+#ifndef INCLUDED_TOOLS_POLY_HXX
+#define INCLUDED_TOOLS_POLY_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/gen.hxx>
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index bb608a11867b..a363fda5c3dd 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PSTM_HXX
-#define _PSTM_HXX
+#ifndef INCLUDED_TOOLS_PSTM_HXX
+#define INCLUDED_TOOLS_PSTM_HXX
 
 #include <boost/unordered_map.hpp>
 #include "tools/toolsdllapi.h"
diff --git a/include/tools/rc.h b/include/tools/rc.h
index b8e42cbb49d7..022bd143b618 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLS_RC_H
-#define _TOOLS_RC_H
+#ifndef INCLUDED_TOOLS_RC_H
+#define INCLUDED_TOOLS_RC_H
 
 #include <tools/rcid.h>
 
diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx
index 8243e55f3758..5f1bfac98e50 100644
--- a/include/tools/rc.hxx
+++ b/include/tools/rc.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_RC_HXX
-#define _TOOLS_RC_HXX
+#ifndef INCLUDED_TOOLS_RC_HXX
+#define INCLUDED_TOOLS_RC_HXX
 
 #include "tools/toolsdllapi.h"
 #include <i18nlangtag/lang.h>
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 9c90f91775af..d3f90059a38f 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLS_RCID_H
-#define _TOOLS_RCID_H
+#ifndef INCLUDED_TOOLS_RCID_H
+#define INCLUDED_TOOLS_RCID_H
 
 #include <tools/resid.hxx>
 
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 3c427cbb6406..cfda1bcba094 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _REF_HXX
-#define _REF_HXX
+#ifndef INCLUDED_TOOLS_REF_HXX
+#define INCLUDED_TOOLS_REF_HXX
 
 #include "tools/toolsdllapi.h"
 #include <vector>
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 1d57694282d3..a652cc97b67a 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_RESARY_HXX
-#define _TOOLS_RESARY_HXX
+#ifndef INCLUDED_TOOLS_RESARY_HXX
+#define INCLUDED_TOOLS_RESARY_HXX
 
 #include "boost/noncopyable.hpp"
 #include <vector>
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 89606c824658..10964e9cdb28 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLS_RESID_HXX
-#define _TOOLS_RESID_HXX
+#ifndef INCLUDED_TOOLS_RESID_HXX
+#define INCLUDED_TOOLS_RESID_HXX
 
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 419336bbb401..8bdf0f6a3f44 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_RESMGR_HXX
-#define _TOOLS_RESMGR_HXX
+#ifndef INCLUDED_TOOLS_RESMGR_HXX
+#define INCLUDED_TOOLS_RESMGR_HXX
 
 #include "tools/toolsdllapi.h"
 #include <i18nlangtag/languagetag.hxx>
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index a3501b75459b..81cabe5e89bb 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTTI_HXX
-#define _RTTI_HXX
+#ifndef INCLUDED_TOOLS_RTTI_HXX
+#define INCLUDED_TOOLS_RTTI_HXX
 
 #include <string.h>
 #include <tools/solar.h>
diff --git a/include/tools/shl.hxx b/include/tools/shl.hxx
index 945921fa114a..0dfff93e4880 100644
--- a/include/tools/shl.hxx
+++ b/include/tools/shl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SHL_HXX
-#define _SHL_HXX
+#ifndef INCLUDED_TOOLS_SHL_HXX
+#define INCLUDED_TOOLS_SHL_HXX
 
 #include <tools/solar.h>
 #include "tools/toolsdllapi.h"
diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx
index 37b97782b66c..0f0df7709a72 100644
--- a/include/tools/simplerm.hxx
+++ b/include/tools/simplerm.hxx
@@ -20,8 +20,8 @@
 // a simple resource manager : no stacks, no sharing of the impl class, only loading of strings and blobs
 // but thread-safety !! :)
 
-#ifndef _TOOLS_SIMPLERESMGR_HXX_
-#define _TOOLS_SIMPLERESMGR_HXX_
+#ifndef INCLUDED_TOOLS_SIMPLERM_HXX
+#define INCLUDED_TOOLS_SIMPLERM_HXX
 
 #include <osl/mutex.hxx>
 #include <tools/resid.hxx>
diff --git a/include/tools/solarmutex.hxx b/include/tools/solarmutex.hxx
index cf4b156a51cf..317e67e0deb4 100644
--- a/include/tools/solarmutex.hxx
+++ b/include/tools/solarmutex.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_SOLARMUTEX_HXX
-#define _TOOLS_SOLARMUTEX_HXX
+#ifndef INCLUDED_TOOLS_SOLARMUTEX_HXX
+#define INCLUDED_TOOLS_SOLARMUTEX_HXX
 
 #include "tools/toolsdllapi.h"
 #include <comphelper/solarmutex.hxx>
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 1bc3f2a238a6..de8dbbd20d5c 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _STREAM_HXX
-#define _STREAM_HXX
+#ifndef INCLUDED_TOOLS_STREAM_HXX
+#define INCLUDED_TOOLS_STREAM_HXX
 
 #include <limits>
 #include "tools/toolsdllapi.h"
diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx
index 0fc87a9b7f0f..e5cbdc28c160 100644
--- a/include/tools/svborder.hxx
+++ b/include/tools/svborder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVBORDER_HXX
-#define _SVBORDER_HXX
+#ifndef INCLUDED_TOOLS_SVBORDER_HXX
+#define INCLUDED_TOOLS_SVBORDER_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/gen.hxx>
diff --git a/include/tools/tenccvt.hxx b/include/tools/tenccvt.hxx
index 9cae3a79927f..e47d58840ecd 100644
--- a/include/tools/tenccvt.hxx
+++ b/include/tools/tenccvt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_TENCCVT_HXX
-#define _TOOLS_TENCCVT_HXX
+#ifndef INCLUDED_TOOLS_TENCCVT_HXX
+#define INCLUDED_TOOLS_TENCCVT_HXX
 
 #include <rtl/textenc.h>
 #include "tools/toolsdllapi.h"
diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index d04652d0a77f..bdfcec536e0c 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_TIME_HXX
-#define _TOOLS_TIME_HXX
+#ifndef INCLUDED_TOOLS_TIME_HXX
+#define INCLUDED_TOOLS_TIME_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/tools.h b/include/tools/tools.h
index c015042d6d42..98495bf13c11 100644
--- a/include/tools/tools.h
+++ b/include/tools/tools.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_H
-#define _TOOLS_H
+#ifndef INCLUDED_TOOLS_TOOLS_H
+#define INCLUDED_TOOLS_TOOLS_H
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/toolsdllapi.h b/include/tools/toolsdllapi.h
index 6e72930e3bc0..111b73bfe709 100644
--- a/include/tools/toolsdllapi.h
+++ b/include/tools/toolsdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TOOLSDLLAPI_H
-#define INCLUDED_TOOLSDLLAPI_H
+#ifndef INCLUDED_TOOLS_TOOLSDLLAPI_H
+#define INCLUDED_TOOLS_TOOLSDLLAPI_H
 
 #include "sal/types.h"
 
diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 3a3ba979d092..79f423a73370 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNQIDX_HXX
-#define _UNQIDX_HXX
+#ifndef INCLUDED_TOOLS_UNQIDX_HXX
+#define INCLUDED_TOOLS_UNQIDX_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 6c5f1320ca34..ab2ed5107c98 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _URLOBJ_HXX
-#define _URLOBJ_HXX
+#ifndef INCLUDED_TOOLS_URLOBJ_HXX
+#define INCLUDED_TOOLS_URLOBJ_HXX
 
 #include "tools/toolsdllapi.h"
 #include "com/sun/star/uno/Reference.hxx"
diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx
index 0f97b583bb5c..395daa35a348 100644
--- a/include/tools/vcompat.hxx
+++ b/include/tools/vcompat.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _VCOMPAT_HXX
-#define _VCOMPAT_HXX
+#ifndef INCLUDED_TOOLS_VCOMPAT_HXX
+#define INCLUDED_TOOLS_VCOMPAT_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
diff --git a/include/tools/vector2d.hxx b/include/tools/vector2d.hxx
index bd4795cb0319..187bdebd8fb7 100644
--- a/include/tools/vector2d.hxx
+++ b/include/tools/vector2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VECTOR2D_HXX
-#define _VECTOR2D_HXX
+#ifndef INCLUDED_TOOLS_VECTOR2D_HXX
+#define INCLUDED_TOOLS_VECTOR2D_HXX
 
 #include <math.h>
 #include <tools/gen.hxx>
diff --git a/include/tools/weakbase.h b/include/tools/weakbase.h
index d37a3fd98ce3..78ce0af749f8 100644
--- a/include/tools/weakbase.h
+++ b/include/tools/weakbase.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_WEAKBASE_H_
-#define _TOOLS_WEAKBASE_H_
+#ifndef INCLUDED_TOOLS_WEAKBASE_H
+#define INCLUDED_TOOLS_WEAKBASE_H
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
diff --git a/include/tools/weakbase.hxx b/include/tools/weakbase.hxx
index 05498e50a8fc..652ea45d50d6 100644
--- a/include/tools/weakbase.hxx
+++ b/include/tools/weakbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLS_WEAKBASE_HXX_
-#define _TOOLS_WEAKBASE_HXX_
+#ifndef INCLUDED_TOOLS_WEAKBASE_HXX
+#define INCLUDED_TOOLS_WEAKBASE_HXX
 
 #include <tools/weakbase.h>
 
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index acd1162ac4e3..be55c19029b7 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOOLS_WINTYPES_HXX
-#define _TOOLS_WINTYPES_HXX
+#ifndef INCLUDED_TOOLS_WINTYPES_HXX
+#define INCLUDED_TOOLS_WINTYPES_HXX
 
 #include <tools/solar.h>
 #include <sal/types.h>
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index 9b143b7ae91b..2dc6d1f30b8b 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _WLDCRD_HXX
-#define _WLDCRD_HXX
+#ifndef INCLUDED_TOOLS_WLDCRD_HXX
+#define INCLUDED_TOOLS_WLDCRD_HXX
 
 #include "tools/toolsdllapi.h"
 #include <osl/thread.h>
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index b8b86fea2aa1..524c99189bf5 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ZCODEC_HXX
-#define _ZCODEC_HXX
+#ifndef INCLUDED_TOOLS_ZCODEC_HXX
+#define INCLUDED_TOOLS_ZCODEC_HXX
 
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>