fixincludeguards.sh: vcl

Change-Id: I3858c2152267474afab8e5a72b9f5da0ac623012

32 files changed, 87 insertions, 87 deletions

diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 95c36c1c4f9d..c92473ccb080 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11ACTIONWRAPPER_H
-#define _SV_AQUA11ACTIONWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
 
 #include "aqua/aquavcltypes.h"
 #include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
 +(void)doAction:(NSString *)action ofElement:(AquaA11yWrapper *)wrapper;
 @end
 
-#endif // _SV_AQUA11ACTIONWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index 85c59b9c489a..74d804e74d91 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11COMPONENTWRAPPER_H
-#define _SV_AQUA11COMPONENTWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
 
 #include "aqua/aquavcltypes.h"
 #include "aqua/aqua11ywrapper.h"
@@ -34,6 +34,6 @@
 +(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // _SV_AQUA11COMPONENTWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 4e7cc11b4816..a889683a4304 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AQUA11YFOCUSLISTENER_HXX_
-#define _AQUA11YFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
 
 #include <salhelper/refobj.hxx>
 
@@ -49,6 +49,6 @@ public:
     virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
 };
 
-#endif // _AQUA11YFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index fdbbcc11358e..a45cde447ff6 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11ROLEHELPER_H
-#define _SV_AQUA11ROLEHELPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
 
 #include "aqua/salinst.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -31,6 +31,6 @@
 +(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
 @end
 
-#endif // _SV_AQUA11ROLEHELPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index 8a435779cae2..af3c297dd363 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11SELECTIONWRAPPER_H
-#define _SV_AQUA11SELECTIONWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
 
 #include "aqua/aquavcltypes.h"
 #include "aqua/aqua11ywrapper.h"
@@ -32,6 +32,6 @@
 +(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // _SV_AQUA11SELECTIONWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index d6d0b39b2914..09b3ff733759 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11TABLEWRAPPER_H
-#define _SV_AQUA11TABLEWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -33,6 +33,6 @@
 -(id)rowsAttribute;
 -(id)columnsAttribute;
 @end
-#endif // _SV_AQUA11TABLEWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index 407c9078b423..4464bd32bfaf 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
-#define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -27,6 +27,6 @@
 }
 +(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange;
 @end
-#endif // _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index c5ee680cfe63..91b2bd929538 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11TEXTWRAPPER_H
-#define _SV_AQUA11TEXTWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
 
 #include "aqua/aquavcltypes.h"
 #include "aqua/aqua11ywrapper.h"
@@ -53,6 +53,6 @@
 +(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // _SV_AQUA11TEXTWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h
index 0e49079653d7..6f597dc354b0 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/aqua/source/a11y/aqua11yutil.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11YUTIL_H
-#define _SV_AQUA11YUTIL_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
 
 #include <com/sun/star/awt/Point.hpp>
 
@@ -28,5 +28,5 @@
 +(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
 @end
 
-#endif // _SV_AQUA11YUTIL_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index a0136d973970..6aa2eab1331d 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11VALUEWRAPPER_H
-#define _SV_AQUA11VALUEWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
 
 #include "aqua/salinst.h"
 #include "aqua/aquavcltypes.h"
@@ -35,6 +35,6 @@
 +(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // _SV_AQUA11VALUEWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index bce043a67667..ecb747f05016 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERBUTTON_H
-#define _SV_AQUA11WRAPPERBUTTON_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERBUTTON_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 8aa45fe4d63d..90433ddc53da 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERCHECKBOX_H
-#define _SV_AQUA11WRAPPERCHECKBOX_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
 
 #include "aqua/aqua11ywrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index a368d136c060..6c8c1fef190b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERCOMBOBOX_H
-#define _SV_AQUA11WRAPPERCOMBOBOX_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
 
 #include "aqua/aqua11ywrapper.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -39,6 +39,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERCOMBOBOX_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 91c3468b69d2..d018927950c7 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERGROUP_H
-#define _SV_AQUA11WRAPPERGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -29,6 +29,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index 1ae72a694bda..14fc22b4afc3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERLIST_H
-#define _SV_AQUA11WRAPPERLIST_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERLIST_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 6e09b9e8487a..15943efbfa82 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H
-#define _SV_AQUA11WRAPPERRADIOBUTTON_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
 
 #include "aqua/aqua11ywrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index 2b6f6c0356fa..fa7b64d12a5e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERROW_H
-#define _SV_AQUA11WRAPPERROW_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -29,6 +29,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERROW_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index d0dc1009bef5..e58acb207c67 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERSCROLLAREA_H
-#define _SV_AQUA11WRAPPERSCROLLAREA_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERSCROLLAREA_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index f417069339d2..c2ca6d93b81e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERSCROLLBAR_H
-#define _SV_AQUA11WRAPPERSCROLLBAR_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERSCROLLBAR_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index 0c651fc32f66..27eaa9b47272 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERSPLITTER_H
-#define _SV_AQUA11WRAPPERSPLITTER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERSPLITTER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index e6f75d8737cb..627d6e37b2a2 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERSTATICTEXT_H
-#define _SV_AQUA11WRAPPERSTATICTEXT_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -29,6 +29,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERSTATICTEXT_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 3b3f9600096b..bd0937e3b3f8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERTABGROUP_H
-#define _SV_AQUA11WRAPPERTABGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERTABGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 6290f154f2f0..e39fcdc6e39a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERTEXTAREA_H
-#define _SV_AQUA11WRAPPERTEXTAREA_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERTEXTAREA_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index 5bea6d005a8b..6c388216e565 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERTOOLBAR_H
-#define _SV_AQUA11WRAPPERTOOLBAR_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERTOOLBAR_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 04dd215092ce..1baba33597d7 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DOCUMENTFOCUSLISTENER_HXX_
-#define _DOCUMENTFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 
@@ -87,5 +87,5 @@ private:
     AquaA11yFocusTracker& m_aFocusTracker;
 };
 
-#endif // _DOCUMENTFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index a7ae636c8748..f5c579ef8965 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DATAFLAVORMAPPING_HXX_
-#define INCLUDED_DATAFLAVORMAPPING_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
 
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 2932a83e7cef..be4443a5e191 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DRAGSOURCE_HXX_
-#define _DRAGSOURCE_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
 
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 100edef7828b..6d8d0d9bac18 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DRAGSOURCECONTEXT_HXX_
-#define _DRAGSOURCECONTEXT_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 988943873e6c..9318d80b9b46 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DROPTARGET_HXX_
-#define _DROPTARGET_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
 
 #include "DataFlavorMapping.hxx"
 #include <cppuhelper/compbase5.hxx>
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
index 251961bd3414..393aed89fb72 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HTMLFMTFLT_HXX
-#define INCLUDED_HTMLFMTFLT_HXX
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
index abff9a8f7fc1..65a7771caf1d 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_PICTTOBMPFLT_HXX
-#define INCLUDED_PICTTOBMPFLT_HXX
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index 2e7670588ede..ba0aecd9f172 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AQUA_CLIPBOARD_HXX_
-#define _AQUA_CLIPBOARD_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
 
 #include "DataFlavorMapping.hxx"
 #include <rtl/ustring.hxx>