fixincludeguards.sh: include/s*

Change-Id: I57fcfd442d2b5815e7c07a9cbd660f3698168dee

80 files changed, 194 insertions, 194 deletions

diff --git a/include/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx
index 7204ebdc845b..bc5c02f50eea 100644
--- a/include/svl/PasswordHelper.hxx
+++ b/include/svl/PasswordHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_PASSWORDHELPER_HXX
-#define _SVTOOLS_PASSWORDHELPER_HXX
+#ifndef INCLUDED_SVL_PASSWORDHELPER_HXX
+#define INCLUDED_SVL_PASSWORDHELPER_HXX
 
 #include "svl/svldllapi.h"
 #include "sal/types.h"
diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx
index 063ba11a95a9..cc5477d6e72c 100644
--- a/include/svl/adrparse.hxx
+++ b/include/svl/adrparse.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ADRPARSE_HXX
-#define _ADRPARSE_HXX
+#ifndef INCLUDED_SVL_ADRPARSE_HXX
+#define INCLUDED_SVL_ADRPARSE_HXX
 
 #include "svl/svldllapi.h"
 #include <vector>
@@ -73,6 +73,6 @@ public:
     }
 };
 
-#endif // _ADRPARSE_HXX
+#endif // INCLUDED_SVL_ADRPARSE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 7dd741592015..6c85142e5c7b 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.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 _AEITEM_HXX
-#define _AEITEM_HXX
+#ifndef INCLUDED_SVL_AEITEM_HXX
+#define INCLUDED_SVL_AEITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/poolitem.hxx>
diff --git a/include/svl/brdcst.hxx b/include/svl/brdcst.hxx
index 258cf6066e58..ca254c3512b1 100644
--- a/include/svl/brdcst.hxx
+++ b/include/svl/brdcst.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 _SFXBRDCST_HXX
-#define _SFXBRDCST_HXX
+#ifndef INCLUDED_SVL_BRDCST_HXX
+#define INCLUDED_SVL_BRDCST_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index ac2931986914..a09039e70f92 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.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 _SVT_BROADCAST_HXX
-#define _SVT_BROADCAST_HXX
+#ifndef INCLUDED_SVL_BROADCAST_HXX
+#define INCLUDED_SVL_BROADCAST_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index c8fb8bb33c80..f96e7713b25b 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_CENUMITM_HXX
-#define SVTOOLS_CENUMITM_HXX
+#ifndef INCLUDED_SVL_CENUMITM_HXX
+#define INCLUDED_SVL_CENUMITM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/debug.hxx>
@@ -81,6 +81,6 @@ public:
     virtual void SetBoolValue(sal_Bool bValue);
 };
 
-#endif // SVTOOLS_CENUMITM_HXX
+#endif // INCLUDED_SVL_CENUMITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index e781ada09a35..2003b51c71eb 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_CINTITEM_HXX
-#define _SVTOOLS_CINTITEM_HXX
+#ifndef INCLUDED_SVL_CINTITEM_HXX
+#define INCLUDED_SVL_CINTITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/debug.hxx>
@@ -269,6 +269,6 @@ inline void CntUInt32Item::SetValue(sal_uInt32 nTheValue)
     m_nValue = nTheValue;
 }
 
-#endif // _SVTOOLS_CINTITEM_HXX
+#endif // INCLUDED_SVL_CINTITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx
index 22055e404b42..2361eaaff295 100644
--- a/include/svl/cjkoptions.hxx
+++ b/include/svl/cjkoptions.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 _SVTOOLS_CJKOPTIONS_HXX
-#define _SVTOOLS_CJKOPTIONS_HXX
+#ifndef INCLUDED_SVL_CJKOPTIONS_HXX
+#define INCLUDED_SVL_CJKOPTIONS_HXX
 
 #include "svl/svldllapi.h"
 #include <sal/types.h>
@@ -65,6 +65,6 @@ public:
     sal_Bool    IsReadOnly(EOption eOption) const;
 };
 
-#endif // _SVTOOLS_CJKOPTIONS_HXX
+#endif // INCLUDED_SVL_CJKOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index 581c558b2575..fc1fa721c35a 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.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 _CNTWALL_HXX
-#define _CNTWALL_HXX
+#ifndef INCLUDED_SVL_CNTWALL_HXX
+#define INCLUDED_SVL_CNTWALL_HXX
 
 #include "svl/svldllapi.h"
 
@@ -66,6 +66,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#endif // _CNTWALL_HXX
+#endif // INCLUDED_SVL_CNTWALL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/converter.hxx b/include/svl/converter.hxx
index 8f423f786307..495e034fc193 100644
--- a/include/svl/converter.hxx
+++ b/include/svl/converter.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_CONVERTER_HXX_
-#define _SV_CONVERTER_HXX_
+#ifndef INCLUDED_SVL_CONVERTER_HXX
+#define INCLUDED_SVL_CONVERTER_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx
index 525e8e73a795..a379ddb33173 100644
--- a/include/svl/ctloptions.hxx
+++ b/include/svl/ctloptions.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 _SVTOOLS_CTLOPTIONS_HXX
-#define _SVTOOLS_CTLOPTIONS_HXX
+#ifndef INCLUDED_SVL_CTLOPTIONS_HXX
+#define INCLUDED_SVL_CTLOPTIONS_HXX
 
 #include "svl/svldllapi.h"
 #include <sal/types.h>
@@ -82,6 +82,6 @@ public:
     bool IsReadOnly(EOption eOption) const;
 };
 
-#endif // _SVTOOLS_CTLOPTIONS_HXX
+#endif // INCLUDED_SVL_CTLOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 1a783bca78d8..a4bf8ccd66f9 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.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 _SVTOOLS_CTYPEITM_HXX
-#define _SVTOOLS_CTYPEITM_HXX
+#ifndef INCLUDED_SVL_CTYPEITM_HXX
+#define INCLUDED_SVL_CTYPEITM_HXX
 
 #include <svl/inettype.hxx>
 #include <svl/custritm.hxx>
@@ -68,6 +68,6 @@ public:
     void                  SetValue( const INetContentType eType );
 };
 
-#endif /* !_SVTOOLS_CTYPEITM_HXX */
+#endif /* ! INCLUDED_SVL_CTYPEITM_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 70948d8fbf43..760296797f21 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_CUSTRITM_HXX
-#define _SVTOOLS_CUSTRITM_HXX
+#ifndef INCLUDED_SVL_CUSTRITM_HXX
+#define INCLUDED_SVL_CUSTRITM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/debug.hxx>
@@ -80,6 +80,6 @@ inline void CntUnencodedStringItem::SetValue(const OUString & rTheValue)
     m_aValue = rTheValue;
 }
 
-#endif //  _SVTOOLS_CUSTRITM_HXX
+#endif // INCLUDED_SVL_CUSTRITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/dateitem.hxx b/include/svl/dateitem.hxx
index 043502966ffc..1a3a7c28ba0b 100644
--- a/include/svl/dateitem.hxx
+++ b/include/svl/dateitem.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 _DATETIMEITEM_HXX
-#define _DATETIMEITEM_HXX
+#ifndef INCLUDED_SVL_DATEITEM_HXX
+#define INCLUDED_SVL_DATEITEM_HXX
 
 #include <tools/rtti.hxx>
 #include <tools/datetime.hxx>
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index ec741da2f6bc..51d85c696513 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_DOCUMENTLOCKFILE_HXX
-#define _SVT_DOCUMENTLOCKFILE_HXX
+#ifndef INCLUDED_SVL_DOCUMENTLOCKFILE_HXX
+#define INCLUDED_SVL_DOCUMENTLOCKFILE_HXX
 
 #include <svl/svldllapi.h>
 
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 65938e2c21e7..acd7b587cfe2 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFXENUMITEM_HXX
-#define SFXENUMITEM_HXX
+#ifndef INCLUDED_SVL_EITEM_HXX
+#define INCLUDED_SVL_EITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/cenumitm.hxx>
@@ -117,6 +117,6 @@ public:
 
 };
 
-#endif // SFXENUMITEM_HXX
+#endif // INCLUDED_SVL_EITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx
index 00c2c16ed77c..9a1925c9a9a3 100644
--- a/include/svl/filenotation.hxx
+++ b/include/svl/filenotation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_FILENOTATION_HXX
-#define SVTOOLS_FILENOTATION_HXX
+#ifndef INCLUDED_SVL_FILENOTATION_HXX
+#define INCLUDED_SVL_FILENOTATION_HXX
 
 #include "svl/svldllapi.h"
 #include <rtl/ustring.hxx>
@@ -59,6 +59,6 @@ namespace svt
 }   // namespace svt
 //.........................................................................
 
-#endif // SVTOOLS_FILENOTATION_HXX
+#endif // INCLUDED_SVL_FILENOTATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 7ace888944ef..bd41bb7ba7dc 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXFILEREC_HXX
-#define _SFXFILEREC_HXX
+#ifndef INCLUDED_SVL_FILEREC_HXX
+#define INCLUDED_SVL_FILEREC_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/debug.hxx>
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 6b0c88ef8f7e..83107421276e 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.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 _SFXFLAGITEM_HXX
-#define _SFXFLAGITEM_HXX
+#ifndef INCLUDED_SVL_FLAGITEM_HXX
+#define INCLUDED_SVL_FLAGITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/fstathelper.hxx b/include/svl/fstathelper.hxx
index 9e69c6ed28ec..c3588a965369 100644
--- a/include/svl/fstathelper.hxx
+++ b/include/svl/fstathelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_FSTATHELPER_HXX
-#define _SVTOOLS_FSTATHELPER_HXX
+#ifndef INCLUDED_SVL_FSTATHELPER_HXX
+#define INCLUDED_SVL_FSTATHELPER_HXX
 
 #include "svl/svldllapi.h"
 #include <rtl/ustring.hxx>
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 618791bebb92..ff08215a73ee 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.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 _GLOBALNAMEITEM_HXX
-#define _GLOBALNAMEITEM_HXX
+#ifndef INCLUDED_SVL_GLOBALNAMEITEM_HXX
+#define INCLUDED_SVL_GLOBALNAMEITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index f32e8e5a51a2..ac2d9987f3bd 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.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 _SFXGRABBAGITEM_HXX
-#define _SFXGRABBAGITEM_HXX
+#ifndef INCLUDED_SVL_GRABBAGITEM_HXX
+#define INCLUDED_SVL_GRABBAGITEM_HXX
 
 #include <map>
 
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 8f5356ac9a13..e479d18920e6 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.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 _SFXHINT_HXX
-#define _SFXHINT_HXX
+#ifndef INCLUDED_SVL_HINT_HXX
+#define INCLUDED_SVL_HINT_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index 6c04ff239c74..f79f50d63e05 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXILSTITEM_HXX
-#define _SFXILSTITEM_HXX
+#ifndef INCLUDED_SVL_ILSTITEM_HXX
+#define INCLUDED_SVL_ILSTITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/poolitem.hxx>
@@ -51,6 +51,6 @@ public:
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
 };
 
-#endif // _SFXINTITEM_HXX
+#endif // INCLUDED_SVL_ILSTITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 66ae68f97722..f2de34b7e114 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_IMAGEITM_HXX
-#define _SVT_IMAGEITM_HXX
+#ifndef INCLUDED_SVL_IMAGEITM_HXX
+#define INCLUDED_SVL_IMAGEITM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/intitem.hxx>
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index bdf69260ff21..78fb9936c279 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.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 _INETHIST_HXX
-#define _INETHIST_HXX
+#ifndef INCLUDED_SVL_INETHIST_HXX
+#define INCLUDED_SVL_INETHIST_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
@@ -119,6 +119,6 @@ public:
  *=======================================================================*/
 DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject);
 
-#endif /* _INETHIST_HXX */
+#endif // INCLUDED_SVL_INETHIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx
index f1554764fb35..c7b2ea8eb705 100644
--- a/include/svl/inettype.hxx
+++ b/include/svl/inettype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _INETTYPE_HXX
-#define _INETTYPE_HXX
+#ifndef INCLUDED_SVL_INETTYPE_HXX
+#define INCLUDED_SVL_INETTYPE_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/inetmime.hxx>
@@ -283,6 +283,6 @@ public:
                       INetContentTypeParameterList * pParameters = 0);
 };
 
-#endif // _INETTYPE_HXX
+#endif // INCLUDED_SVL_INETTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index 39c3a8589be9..70da3796c7ca 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_INSTRM_HXX
-#define SVTOOLS_INSTRM_HXX
+#ifndef INCLUDED_SVL_INSTRM_HXX
+#define INCLUDED_SVL_INSTRM_HXX
 
 #include "svl/svldllapi.h"
 #include <com/sun/star/uno/Reference.h>
@@ -68,6 +68,6 @@ public:
     virtual void RemoveMark(sal_uLong nPos);
 };
 
-#endif // SVTOOLS_INSTRM_HXX
+#endif // INCLUDED_SVL_INSTRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index a9cb341aec10..7a17ad63a383 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXINTITEM_HXX
-#define _SFXINTITEM_HXX
+#ifndef INCLUDED_SVL_INTITEM_HXX
+#define INCLUDED_SVL_INTITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/cintitem.hxx>
@@ -158,6 +158,6 @@ public:
     { return new SfxUInt32Item(*this); }
 };
 
-#endif // _SFXINTITEM_HXX
+#endif // INCLUDED_SVL_INTITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx
index cd966f5fcc4f..4df3c595ff59 100644
--- a/include/svl/isethint.hxx
+++ b/include/svl/isethint.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 _SFXISETHINT_HXX
-#define _SFXISETHINT_HXX
+#ifndef INCLUDED_SVL_ISETHINT_HXX
+#define INCLUDED_SVL_ISETHINT_HXX
 
 #include "svl/svldllapi.h"
 
diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx
index 4dada91a42b7..aad2c594aa80 100644
--- a/include/svl/itemiter.hxx
+++ b/include/svl/itemiter.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 _SFXITEMITER_HXX
-#define _SFXITEMITER_HXX
+#ifndef INCLUDED_SVL_ITEMITER_HXX
+#define INCLUDED_SVL_ITEMITER_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 4ce510ad133f..98f8a01f426a 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXITEMPOOL_HXX
-#define _SFXITEMPOOL_HXX
+#ifndef INCLUDED_SVL_ITEMPOOL_HXX
+#define INCLUDED_SVL_ITEMPOOL_HXX
 
 #include <limits.h>
 #include <rtl/string.hxx>
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 46280d7fa34e..006157ecec60 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.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 _SFX_ITEMPROP_HXX
-#define _SFX_ITEMPROP_HXX
+#ifndef INCLUDED_SVL_ITEMPROP_HXX
+#define INCLUDED_SVL_ITEMPROP_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 1a4b121a56a9..b4e4655d5582 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.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 _SFXITEMSET_HXX
-#define _SFXITEMSET_HXX
+#ifndef INCLUDED_SVL_ITEMSET_HXX
+#define INCLUDED_SVL_ITEMSET_HXX
 
 #include "svl/svldllapi.h"
 
@@ -186,6 +186,6 @@ public:
                                      sal_Bool bInvalidAsDefault = sal_True );
 };
 
-#endif // #ifndef _SFXITEMSET_HXX
+#endif // INCLUDED_SVL_ITEMSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index 08a28e504f17..56f499cbfb57 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.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 _SVTOOLS_LANGUAGEOPTIONS_HXX
-#define _SVTOOLS_LANGUAGEOPTIONS_HXX
+#ifndef INCLUDED_SVL_LANGUAGEOPTIONS_HXX
+#define INCLUDED_SVL_LANGUAGEOPTIONS_HXX
 
 #include "svl/svldllapi.h"
 #include <sal/types.h>
@@ -113,6 +113,6 @@ public:
     bool isCJKKeyboardLayoutInstalled() const;
 };
 
-#endif // _SVTOOLS_LANGUAGEOPTIONS_HXX
+#endif // INCLUDED_SVL_LANGUAGEOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 163c2168c4c0..fb3ab8eab628 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.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 _LCKBITEM_HXX
-#define _LCKBITEM_HXX
+#ifndef INCLUDED_SVL_LCKBITEM_HXX
+#define INCLUDED_SVL_LCKBITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index eeb275e302aa..67a8f133c085 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.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 _SVT_LISTENER_HXX
-#define _SVT_LISTENER_HXX
+#ifndef INCLUDED_SVL_LISTENER_HXX
+#define INCLUDED_SVL_LISTENER_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
diff --git a/include/svl/listeneriter.hxx b/include/svl/listeneriter.hxx
index 9a621d80e244..9a4cc498cd4d 100644
--- a/include/svl/listeneriter.hxx
+++ b/include/svl/listeneriter.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 _SVT_LISTENERITER_HXX
-#define _SVT_LISTENERITER_HXX
+#ifndef INCLUDED_SVL_LISTENERITER_HXX
+#define INCLUDED_SVL_LISTENERITER_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
diff --git a/include/svl/lngmisc.hxx b/include/svl/lngmisc.hxx
index c1b4a0160277..ca3e10127c1c 100644
--- a/include/svl/lngmisc.hxx
+++ b/include/svl/lngmisc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_LNGMISC_HXX_
-#define _SVTOOLS_LNGMISC_HXX_
+#ifndef INCLUDED_SVL_LNGMISC_HXX
+#define INCLUDED_SVL_LNGMISC_HXX
 
 #include "svl/svldllapi.h"
 
diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx
index b9f62cd78504..7f32d8494911 100644
--- a/include/svl/lockfilecommon.hxx
+++ b/include/svl/lockfilecommon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_LOCKFILECOMMON_HXX
-#define _SVT_LOCKFILECOMMON_HXX
+#ifndef INCLUDED_SVL_LOCKFILECOMMON_HXX
+#define INCLUDED_SVL_LOCKFILECOMMON_HXX
 
 #include <svl/svldllapi.h>
 
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index e54368abb557..a6906dc4fc9e 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.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 _SFXLSTNER_HXX
-#define _SFXLSTNER_HXX
+#ifndef INCLUDED_SVL_LSTNER_HXX
+#define INCLUDED_SVL_LSTNER_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/rtti.hxx>
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index c6c218aec46f..774453848994 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.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 _SFXMACITEM_HXX
-#define _SFXMACITEM_HXX
+#ifndef INCLUDED_SVL_MACITEM_HXX
+#define INCLUDED_SVL_MACITEM_HXX
 
 // class SvxMacroItem ----------------------------------------------------
 
diff --git a/include/svl/mailenum.hxx b/include/svl/mailenum.hxx
index a01c6bc109ed..70581f7a82b7 100644
--- a/include/svl/mailenum.hxx
+++ b/include/svl/mailenum.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 _MAILENUM_HXX
-#define _MAILENUM_HXX
+#ifndef INCLUDED_SVL_MAILENUM_HXX
+#define INCLUDED_SVL_MAILENUM_HXX
 
 // enum ------------------------------------------------------------------
 
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index 090d95450159..81dac6345632 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.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 _SFXMETRICITEM_HXX
-#define _SFXMETRICITEM_HXX
+#ifndef INCLUDED_SVL_METITEM_HXX
+#define INCLUDED_SVL_METITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/intitem.hxx>
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index 5ed3fbf9838e..4438c7fc0417 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_NFKEYTAB_HXX
-#define INCLUDED_SVTOOLS_NFKEYTAB_HXX
+#ifndef INCLUDED_SVL_NFKEYTAB_HXX
+#define INCLUDED_SVL_NFKEYTAB_HXX
 
 #include <vector>
 #include <rtl/ustring.hxx>
@@ -117,6 +117,6 @@ public:
     const OUString & operator[] (Keywords_t::size_type n) const { return m_keywords[n]; }
 };
 
-#endif // INCLUDED_SVTOOLS_NFKEYTAB_HXX
+#endif // INCLUDED_SVL_NFKEYTAB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/nfsymbol.hxx b/include/svl/nfsymbol.hxx
index 0edfc33e112d..8a659857e088 100644
--- a/include/svl/nfsymbol.hxx
+++ b/include/svl/nfsymbol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_NFSYMBOL_HXX
-#define INCLUDED_SVTOOLS_NFSYMBOL_HXX
+#ifndef INCLUDED_SVL_NFSYMBOL_HXX
+#define INCLUDED_SVL_NFSYMBOL_HXX
 
 /* ATTENTION! If new types arrive that had its content previously handled as
  * SYMBOLTYPE_STRING, they have to be added at several places in zforscan.cxx
@@ -58,6 +58,6 @@ enum NfSymbolType
 
 }   // namespace svt
 
-#endif // INCLUDED_SVTOOLS_NFSYMBOL_HXX
+#endif // INCLUDED_SVL_NFSYMBOL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/nfversi.hxx b/include/svl/nfversi.hxx
index 3e86af078fe4..c18dda2dcadb 100644
--- a/include/svl/nfversi.hxx
+++ b/include/svl/nfversi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef NF_NFVERSI_HXX
-#define NF_NFVERSI_HXX
+#ifndef INCLUDED_SVL_NFVERSI_HXX
+#define INCLUDED_SVL_NFVERSI_HXX
 
 //      file IDs
 
diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx
index 993b35e28ea8..ec4a5503de83 100644
--- a/include/svl/nranges.hxx
+++ b/include/svl/nranges.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #ifdef MACOSX
-// We need an empty block in here. Otherwise, if the #ifndef _SFXNRANGES_HXX
+// We need an empty block in here. Otherwise, if the #ifndef INCLUDED_SVL_NRANGES_HXX
 // line is the first line, the Mac OS X version of the gcc preprocessor will
 // incorrectly optimize the inclusion process and will never include this file
 // a second time
 #endif
 
-#ifndef _SFXNRANGES_HXX
-#define _SFXNRANGES_HXX
+#ifndef INCLUDED_SVL_NRANGES_HXX
+#define INCLUDED_SVL_NRANGES_HXX
 
 #include <tools/solar.h>
 
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 515a73fb26a6..7b3db7bfea6b 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.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 _NUMUNO_HXX
-#define _NUMUNO_HXX
+#ifndef INCLUDED_SVL_NUMUNO_HXX
+#define INCLUDED_SVL_NUMUNO_HXX
 
 #include "svl/svldllapi.h"
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
@@ -86,7 +86,7 @@ public:
     ::comphelper::SharedMutex&  getSharedMutex() const;
 };
 
-#endif // #ifndef _NUMUNO_HXX
+#endif // INCLUDED_SVL_NUMUNO_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index d61b31f570d2..6b6473c5cad9 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_ONDEMAND_HXX
-#define INCLUDED_SVTOOLS_ONDEMAND_HXX
+#ifndef INCLUDED_SVL_ONDEMAND_HXX
+#define INCLUDED_SVL_ONDEMAND_HXX
 
 #include <unotools/syslocale.hxx>
 #include <i18nlangtag/lang.h>
@@ -379,6 +379,6 @@ public:
             NativeNumberWrapper&    operator*()     { return *get(); }
 };
 
-#endif // INCLUDED_SVTOOLS_ONDEMAND_HXX
+#endif // INCLUDED_SVL_ONDEMAND_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index 31899599fc90..50f5b0465c63 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_OUTSTRM_HXX
-#define SVTOOLS_OUTSTRM_HXX
+#ifndef INCLUDED_SVL_OUTSTRM_HXX
+#define INCLUDED_SVL_OUTSTRM_HXX
 
 #include "svl/svldllapi.h"
 #include <com/sun/star/uno/Reference.h>
@@ -54,6 +54,6 @@ public:
     virtual sal_uInt16 IsA() const;
 };
 
-#endif // SVTOOLS_OUTSTRM_HXX
+#endif // INCLUDED_SVL_OUTSTRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index e4cead159c8b..1c0b368b2a74 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OWNLIST_HXX
-#define _OWNLIST_HXX
+#ifndef INCLUDED_SVL_OWNLIST_HXX
+#define INCLUDED_SVL_OWNLIST_HXX
 
 #include "svl/svldllapi.h"
 #include <com/sun/star/uno/Sequence.hxx>
@@ -85,6 +85,6 @@ public:
                     }
 };
 
-#endif // _OWNLIST_HXX
+#endif // INCLUDED_SVL_OWNLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx
index 5f91d3578f9a..04c3de0ec186 100644
--- a/include/svl/pickerhistoryaccess.hxx
+++ b/include/svl/pickerhistoryaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_PICKERHISTORYACCESS_HXX
-#define SVTOOLS_PICKERHISTORYACCESS_HXX
+#ifndef INCLUDED_SVL_PICKERHISTORYACCESS_HXX
+#define INCLUDED_SVL_PICKERHISTORYACCESS_HXX
 
 #include "svl/svldllapi.h"
 
@@ -40,6 +40,6 @@ namespace svt
 }   // namespace svt
 //.........................................................................
 
-#endif // SVTOOLS_PICKERHISTORYACCESS_HXX
+#endif // INCLUDED_SVL_PICKERHISTORYACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/poolcach.hxx b/include/svl/poolcach.hxx
index eaf6ad3deef9..de3251927ea0 100644
--- a/include/svl/poolcach.hxx
+++ b/include/svl/poolcach.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 _SFXPOOLCACH_HXX
-#define _SFXPOOLCACH_HXX
+#ifndef INCLUDED_SVL_POOLCACH_HXX
+#define INCLUDED_SVL_POOLCACH_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/solar.h>
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 1a7765c9995e..c22c19dcb437 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.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 _SFXPOOLITEM_HXX
-#define _SFXPOOLITEM_HXX
+#ifndef INCLUDED_SVL_POOLITEM_HXX
+#define INCLUDED_SVL_POOLITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <com/sun/star/uno/Any.hxx>
@@ -407,6 +407,6 @@ DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem);
 
 // -----------------------------------------------------------------------
 
-#endif // #ifndef _SFXPOOLITEM_HXX
+#endif // INCLUDED_SVL_POOLITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 6906e24baaf7..08d880434690 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.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 _SFXPTITEM_HXX
-#define _SFXPTITEM_HXX
+#ifndef INCLUDED_SVL_PTITEM_HXX
+#define INCLUDED_SVL_PTITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/poolitem.hxx>
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index b9f0f950eb63..dbb021c7d2d9 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.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 _SFXRECTITEM_HXX
-#define _SFXRECTITEM_HXX
+#ifndef INCLUDED_SVL_RECTITEM_HXX
+#define INCLUDED_SVL_RECTITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/debug.hxx>
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 450e958ec179..4b17fd2400df 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXRNGITEM_HXX
-#define _SFXRNGITEM_HXX
+#ifndef INCLUDED_SVL_RNGITEM_HXX
+#define INCLUDED_SVL_RNGITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/poolitem.hxx>
diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index d2c842d98ebb..87520fdddee2 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_SHARECONTROLFILE_HXX
-#define _SVT_SHARECONTROLFILE_HXX
+#ifndef INCLUDED_SVL_SHARECONTROLFILE_HXX
+#define INCLUDED_SVL_SHARECONTROLFILE_HXX
 
 #include <svl/svldllapi.h>
 
diff --git a/include/svl/sharedstring.hxx b/include/svl/sharedstring.hxx
index 413717f9da22..a36ae135fa2a 100644
--- a/include/svl/sharedstring.hxx
+++ b/include/svl/sharedstring.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SVL_SHAREDSTRING_HXX
-#define SVL_SHAREDSTRING_HXX
+#ifndef INCLUDED_SVL_SHAREDSTRING_HXX
+#define INCLUDED_SVL_SHAREDSTRING_HXX
 
 #include "svl/svldllapi.h"
 #include "rtl/ustring.hxx"
diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx
index c1b76981f229..1b2796d1d514 100644
--- a/include/svl/sharedstringpool.hxx
+++ b/include/svl/sharedstringpool.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SVL_STRINGPOOL_HXX
-#define SVL_STRINGPOOL_HXX
+#ifndef INCLUDED_SVL_SHAREDSTRINGPOOL_HXX
+#define INCLUDED_SVL_SHAREDSTRINGPOOL_HXX
 
 #include "svl/sharedstring.hxx"
 
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index f42686e81f9a..1460430787fa 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.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 _SFXSLSTITM_HXX
-#define _SFXSLSTITM_HXX
+#ifndef INCLUDED_SVL_SLSTITM_HXX
+#define INCLUDED_SVL_SLSTITM_HXX
 
 #include <vector>
 
diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx
index 5c74a3dc4f6e..0752bd6cd835 100644
--- a/include/svl/smplhint.hxx
+++ b/include/svl/smplhint.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 _SFXSMPLHINT_HXX
-#define _SFXSMPLHINT_HXX
+#ifndef INCLUDED_SVL_SMPLHINT_HXX
+#define INCLUDED_SVL_SMPLHINT_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/hint.hxx>
diff --git a/include/svl/srchdefs.hxx b/include/svl/srchdefs.hxx
index f339ebff9273..39017f6dfb6a 100644
--- a/include/svl/srchdefs.hxx
+++ b/include/svl/srchdefs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_SRCHDEFS_HXX_
-#define _SFX_SRCHDEFS_HXX_
+#ifndef INCLUDED_SVL_SRCHDEFS_HXX
+#define INCLUDED_SVL_SRCHDEFS_HXX
 
 
 #define SEARCH_OPTIONS_SEARCH       ((sal_uInt16)0x0001)
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 3fb8949e2f23..cbe5608692fe 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.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 _SFX_SRCHITEM_HXX
-#define _SFX_SRCHITEM_HXX
+#ifndef INCLUDED_SVL_SRCHITEM_HXX
+#define INCLUDED_SVL_SRCHITEM_HXX
 
 #include "sal/config.h"
 #include "svl/svldllapi.h"
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index a4109218c79e..feccd5f36b28 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXSTRITEM_HXX
-#define _SFXSTRITEM_HXX
+#ifndef INCLUDED_SVL_STRITEM_HXX
+#define INCLUDED_SVL_STRITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <svl/custritm.hxx>
@@ -43,6 +43,6 @@ public:
     virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
 };
 
-#endif // _SFXSTRITEM_HXX
+#endif // INCLUDED_SVL_STRITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx
index 167d3696d3a2..4645ab2bb128 100644
--- a/include/svl/strmadpt.hxx
+++ b/include/svl/strmadpt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_STRMADPT_HXX
-#define SVTOOLS_STRMADPT_HXX
+#ifndef INCLUDED_SVL_STRMADPT_HXX
+#define INCLUDED_SVL_STRMADPT_HXX
 
 #include "svl/svldllapi.h"
 #include <com/sun/star/io/XInputStream.hpp>
@@ -122,6 +122,6 @@ public:
                com::sun::star::uno::RuntimeException);
 };
 
-#endif // SVTOOLS_STRMADPT_HXX
+#endif // INCLUDED_SVL_STRMADPT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 9d4b3be2596e..259e3ead1412 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXSTYLE_HXX
-#define _SFXSTYLE_HXX
+#ifndef INCLUDED_SVL_STYLE_HXX
+#define INCLUDED_SVL_STYLE_HXX
 
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx
index deaed2591a83..dd330ffbe736 100644
--- a/include/svl/stylepool.hxx
+++ b/include/svl/stylepool.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 INCLUDED_SVTOOLS_STYLEPOOL_HXX
-#define INCLUDED_SVTOOLS_STYLEPOOL_HXX
+#ifndef INCLUDED_SVL_STYLEPOOL_HXX
+#define INCLUDED_SVL_STYLEPOOL_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <rtl/ustring.hxx>
diff --git a/include/svl/stylesheetuser.hxx b/include/svl/stylesheetuser.hxx
index 787263ff4a8e..0f0be440b93e 100644
--- a/include/svl/stylesheetuser.hxx
+++ b/include/svl/stylesheetuser.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SVL_STYLESHEETUSER_HXX_INCLUDED
-#define SVL_STYLESHEETUSER_HXX_INCLUDED
+#ifndef INCLUDED_SVL_STYLESHEETUSER_HXX
+#define INCLUDED_SVL_STYLESHEETUSER_HXX
 
 namespace svl
 {
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 7f5e7135f11d..60b69d3c2b2c 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDDE_HXX
-#define _SVDDE_HXX
+#ifndef INCLUDED_SVL_SVDDE_HXX
+#define INCLUDED_SVL_SVDDE_HXX
 
 #include "svl/svldllapi.h"
 #include <sot/exchange.hxx>
@@ -411,6 +411,6 @@ inline long DdeTransaction::GetError()
 {
     return rDde.GetError();
 }
-#endif // _SVDDE_HXX
+#endif // INCLUDED_SVL_SVDDE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index 1a576eced6fd..4f79db3c32ca 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.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 _SFXSZITEM_HXX
-#define _SFXSZITEM_HXX
+#ifndef INCLUDED_SVL_SZITEM_HXX
+#define INCLUDED_SVL_SZITEM_HXX
 
 #include <tools/gen.hxx>
 
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 80820c51ee57..00522c67451c 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.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 _UNDO_HXX
-#define _UNDO_HXX
+#ifndef INCLUDED_SVL_UNDO_HXX
+#define INCLUDED_SVL_UNDO_HXX
 
 #include <svl/svldllapi.h>
 #include <rtl/ustring.hxx>
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 321d9cd2ae0b..7dd79d2f3cc1 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_URIHELPER_HXX
-#define SVTOOLS_URIHELPER_HXX
+#ifndef INCLUDED_SVL_URIHELPER_HXX
+#define INCLUDED_SVL_URIHELPER_HXX
 
 #include "svl/svldllapi.h"
 #include "com/sun/star/uno/Reference.hxx"
@@ -160,6 +160,6 @@ SVL_DLLPUBLIC OUString removePassword(OUString const & rURI,
                                       rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
 }
 
-#endif // SVTOOLS_URIHELPER_HXX
+#endif // INCLUDED_SVL_URIHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index 89d02cb70a29..24c0f38d0fc5 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _URLBMK_HXX
-#define _URLBMK_HXX
+#ifndef INCLUDED_SVL_URLBMK_HXX
+#define INCLUDED_SVL_URLBMK_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/svl/urlfilter.hxx b/include/svl/urlfilter.hxx
index d685015a2e36..e8065fa8fae1 100644
--- a/include/svl/urlfilter.hxx
+++ b/include/svl/urlfilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_URL_FILTER_HXX
-#define SVTOOLS_URL_FILTER_HXX
+#ifndef INCLUDED_SVL_URLFILTER_HXX
+#define INCLUDED_SVL_URLFILTER_HXX
 
 #include <tools/wldcrd.hxx>
 #include <functional>
@@ -39,6 +39,6 @@ public:
     static void createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters);
 };
 
-#endif // SVTOOLS_URL_FILTER_HXX
+#endif // INCLUDED_SVL_URLFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index adb72d0578e7..2d082d56e431 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXVISIBILITYITEM_HXX
-#define _SFXVISIBILITYITEM_HXX
+#ifndef INCLUDED_SVL_VISITEM_HXX
+#define INCLUDED_SVL_VISITEM_HXX
 
 #include "svl/svldllapi.h"
 #include <tools/debug.hxx>
@@ -82,6 +82,6 @@ public:
     void SetValue(sal_Bool bVisible) { m_nValue.bVisible = bVisible; }
 };
 
-#endif // _SFXVISIBILITYITEM_HXX
+#endif // INCLUDED_SVL_VISITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/whiter.hxx b/include/svl/whiter.hxx
index e92383624743..fbf14c734141 100644
--- a/include/svl/whiter.hxx
+++ b/include/svl/whiter.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 _SFX_WHITER_HXX
-#define _SFX_WHITER_HXX
+#ifndef INCLUDED_SVL_WHITER_HXX
+#define INCLUDED_SVL_WHITER_HXX
 
 #include "svl/svldllapi.h"
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 34521c8df80d..cfe6dad648cd 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.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 _ZFORLIST_HXX
-#define _ZFORLIST_HXX
+#ifndef INCLUDED_SVL_ZFORLIST_HXX
+#define INCLUDED_SVL_ZFORLIST_HXX
 
 #include "svl/svldllapi.h"
 #include <rtl/ustrbuf.hxx>
@@ -1019,6 +1019,6 @@ inline sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear, sal_u
     return nYear;
 }
 
-#endif  // _ZFORLIST_HXX
+#endif // INCLUDED_SVL_ZFORLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 7b7eca08e73e..dff3d0e2c1e4 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.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 _ZFORMAT_HXX
-#define _ZFORMAT_HXX
+#ifndef INCLUDED_SVL_ZFORMAT_HXX
+#define INCLUDED_SVL_ZFORMAT_HXX
 
 #include "svl/svldllapi.h"
 #include <i18nlangtag/mslangid.hxx>
@@ -696,6 +696,6 @@ private:
     }
 };
 
-#endif  // _ZFORMAT_HXX
+#endif // INCLUDED_SVL_ZFORMAT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */