12 files changed, 31 insertions, 31 deletions
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 0a1ada6cd544..6ea35ec41d73 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AQUAFILEPICKERDELEGATE_HXX_
-#define _AQUAFILEPICKERDELEGATE_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_AQUAFILEPICKERDELEGATE_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_AQUAFILEPICKERDELEGATE_HXX
 
 #include <premac.h>
 #include <Cocoa/Cocoa.h>
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 1b5ef0d40e2b..c844c5176a2c 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CFSTRINGUTILITIES_HXX_
-#define _CFSTRINGUTILITIES_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
 
 #include <premac.h>
 #include <Carbon/Carbon.h>
@@ -178,6 +178,6 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, cons
     SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
 }
 
-#endif //_CFSTRINGUTILITIES_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index b00aad9959bd..c77ed935b11d 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTROLHELPER_HXX_
-#define _CONTROLHELPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -183,6 +183,6 @@ private:
     void         layoutControls();
 };
 
-#endif //_CONTROLHELPER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx
index ad42d07fe735..e3fe780563e0 100644
--- a/fpicker/source/aqua/FPServiceInfo.hxx
+++ b/fpicker/source/aqua/FPServiceInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FPSERVICEINFO_HXX_
-#define _FPSERVICEINFO_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_FPSERVICEINFO_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_FPSERVICEINFO_HXX
 
 // the service names
 #define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.AquaFilePicker"
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 7facc808f363..0464b1ce4d9a 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILTERHELPER_HXX_
-#define _FILTERHELPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
 
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -121,6 +121,6 @@ private:
 
 };
 
-#endif //_FILTERHELPER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index 52e5c41b72f6..c921393c6b5a 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _NSSTRING_OOOADDITIONS_HXX_
-#define _NSSTRING_OOOADDITIONS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX
 
 #include <premac.h>
 #import <Cocoa/Cocoa.h>
@@ -32,6 +32,6 @@
 - (OUString) OUString;
 @end
 
-#endif // _NSSTRING_OOOADDITIONS_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
index 811e9cf97748..5329e9261744 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _NSURL_OOOADDITIONS_HXX_
-#define _NSURL_OOOADDITIONS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_NSURL_OOOADDITIONS_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_NSURL_OOOADDITIONS_HXX
 
 #include <premac.h>
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index 7b18531abd69..591525ba8601 100644
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SALAQUACONSTANTS_H_
-#define _SALAQUACONSTANTS_H_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H
 
 #define kAppFourCharCode 'LibO'
 #define kControlPropertyTracking 'Trck'
@@ -51,6 +51,6 @@
 
 #define kAquaPopupButtonDefaultHeight (26)
 
-#endif //_SALAQUACONSTANTS_H_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 7932d8180d6e..d0f2a542d23e 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SALAQUAFILEPICKER_HXX_
-#define _SALAQUAFILEPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -220,6 +220,6 @@ public:
 
 };
 
-#endif // _SALAQUAFILEPICKER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index aa13545071f8..313acb79dc34 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SALAQUAFOLDERPICKER_HXX_
-#define _SALAQUAFOLDERPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/util/XCancellable.hpp>
@@ -110,6 +110,6 @@ private:
 
 };
 
-#endif // _SALAQUAFOLDERPICKER_HXX_
+#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index dff3fed90644..076f22a1ecc2 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SALAQUAFPICKER_HXX_
-#define _SALAQUAFPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAPICKER_HXX
 
 #include <osl/mutex.hxx>
 
diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index 4a3d63227919..fd6647eabeb4 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _RESOURCEPROVIDER_HXX_
-#define _RESOURCEPROVIDER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_AQUA_RESOURCEPROVIDER_HXX
+#define INCLUDED_FPICKER_SOURCE_AQUA_RESOURCEPROVIDER_HXX
 
 #include <sal/types.h>