Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

65 files changed, 154 insertions, 154 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>
 
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index e629463032f6..890f860d7659 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_CONTROLACCESS_HXX
-#define SVTOOLS_CONTROLACCESS_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX
 
 #include <svtools/fileview.hxx>
 #include <vcl/lstbox.hxx>
@@ -113,6 +113,6 @@ namespace svt
 }   // namespace svt
 
 
-#endif // SVTOOLS_CONTROLACCESS_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index e539fa2f339c..27d980876744 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.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_SVT_FILEPICKER_HXX
-#define INCLUDED_SVT_FILEPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
 
 #include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
@@ -227,6 +227,6 @@ private:
     DECL_LINK(          DialogClosedHdl, Dialog* );
 };
 
-#endif // INCLUDED_SVT_FILEPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 8819e52cee96..a285ea0cd727 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.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_SVT_FOLDERPICKER_HXX
-#define INCLUDED_SVT_FOLDERPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
@@ -103,6 +103,6 @@ protected:
     virtual sal_Int16       implExecutePicker( ) SAL_OVERRIDE;
 };
 
-#endif // INCLUDED_SVT_FOLDERPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 125e54a86109..51d300b53697 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.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 _PLACESLISTBOX_HXX_
-#define _PLACESLISTBOX_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_PLACESLISTBOX_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_PLACESLISTBOX_HXX
 
 #include <iodlg.hxx>
 
diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
index 2984f35b4447..9e71b1176d18 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.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_QUERYFOLDERNAME_HXX
-#define INCLUDED_QUERYFOLDERNAME_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
@@ -41,6 +41,6 @@ public:
     OUString GetName() const { return m_pNameEdit->GetText(); }
 };
 
-#endif // INCLUDED_QUERYFOLDERNAME_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index ae923c48028b..77a93e6f7f8a 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
-#define SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX
 
 #include <tools/link.hxx>
 #include <rtl/ref.hxx>
@@ -102,6 +102,6 @@ namespace svt
 } // namespace svt
 
 
-#endif // SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index c103a91f8bc2..b8c175ee6d67 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_COMMONPICKER_HXX
-#define SVTOOLS_COMMONPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
 
 #include <cppuhelper/compbase5.hxx>
 #include <com/sun/star/ui/dialogs/XControlInformation.hpp>
@@ -192,6 +192,6 @@ namespace svt
 }   // namespace svt
 
 
-#endif // SVTOOLS_COMMONPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 7de39150cedc..9c9ef6052dbc 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_FILEPICKER_INTERACTION_HXX
-#define SVTOOLS_FILEPICKER_INTERACTION_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -80,6 +80,6 @@ namespace svt
 }   // namespace svt
 
 
-#endif // SVTOOLS_FILEPICKER_INTERACTION_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index 3f16e539be88..7d3d7bd8c83d 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX
-#define SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX
 
 #include "fpinteraction.hxx"
 
@@ -206,6 +206,6 @@ namespace svt
 } // namespace svt
 
 
-#endif // SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/source/office/fpsofficeResMgr.hxx
index 95af355c6d6c..7fb6f05ca5b9 100644
--- a/fpicker/source/office/fpsofficeResMgr.hxx
+++ b/fpicker/source/office/fpsofficeResMgr.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 _FPS_OFFICE_RESMGR_HXX_
-#define _FPS_OFFICE_RESMGR_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX
 
 #include <rtl/instance.hxx>
 #include <tools/resmgr.hxx>
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index da6dcc14364a..b03ba84d027f 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.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 _IODLGIMPL_HXX
-#define _IODLGIMPL_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
@@ -453,6 +453,6 @@ inline SvtFileView* SvtFileDialog::GetView() const
 #define DIALOG_SIZE_CHANGED     5
 
 
-#endif // #ifndef _IODLG_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index fb6a3fc11143..816d6ef91e0f 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.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 _IODLGIMP_HXX
-#define _IODLGIMP_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
 
 #include <PlacesListBox.hxx>
 
@@ -271,7 +271,7 @@ inline  void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter
     SetCurFilter( pFilter, pFilter->GetName() );
 }
 
-#endif // #ifndef _IODLGIMP_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx
index 1981b7cabf0a..0bf794940f71 100644
--- a/fpicker/source/office/pickercallbacks.hxx
+++ b/fpicker/source/office/pickercallbacks.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVTOOLS_PICKER_CALLBACKS_HXX
-#define SVTOOLS_PICKER_CALLBACKS_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX
+#define INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -56,6 +56,6 @@ namespace svt
 }   // namespace svt
 
 
-#endif // SVTOOLS_PICKER_CALLBACKS_HXX
+#endif // INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
index 01b1bbf2f866..9e03045a6bd3 100644
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _FPSERVICEINFO_HXX_
-#define _FPSERVICEINFO_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FPSERVICEINFO_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FPSERVICEINFO_HXX
 
 // the service name is a description of a set of
 // interfaces (is the same as component categories in COM)
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index de3f79e1b0c0..054f7466749d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILEOPENDLG_HXX_
-#define _FILEOPENDLG_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEOPENDLG_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEOPENDLG_HXX
 
 #include <sal/types.h>
 
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 92240cf7715e..9aee615b9509 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILEPICKER_HXX_
-#define _FILEPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKER_HXX
 
 #include <cppuhelper/compbase6.hxx>
 #include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 1aeddff1abe0..26e755d6efbe 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILTER_CONTAINER_HXX_
-#define _FILTER_CONTAINER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILTERCONTAINER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILTERCONTAINER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 19c74370e4e3..56ac6b1d54a1 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
 
 #include "comptr.hxx"
 #include "vistatypes.h"
@@ -50,6 +50,6 @@ class IVistaFilePickerInternalNotify
 
 }}}
 
-#endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index 60117965765f..e826e5431a89 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PREVIEWCTRL_HXX_
-#define _PREVIEWCTRL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWCTRL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWCTRL_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 2ce0b1f4c407..2cb7093960f4 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_VISTA_FILEPICKER_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX
 
 #include "asyncrequests.hxx"
 #include "VistaFilePickerImpl.hxx"
@@ -280,6 +280,6 @@ public:
 } // namespace win32
 } // namespace fpicker
 
-#endif  // FPICKER_WIN32_VISTA_FILEPICKER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 2d8901d17704..98a61afc0b24 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4917 )
@@ -203,6 +203,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
 
 #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
-#endif  // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 2b05cc54b333..47e1be65a5e8 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
-#define FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4917 )
@@ -341,6 +341,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 
 #endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
-#endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index d4b2a3bfc07e..3383b89eaad5 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _WINFILEOPENIMPL_HXX_
-#define _WINFILEOPENIMPL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_WINFILEOPENIMPL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_WINFILEOPENIMPL_HXX
 
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index 731eccf85fe6..14f65f053bc5 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ASYNCEVENTNOTIFIER_HXX_
-#define _ASYNCEVENTNOTIFIER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCEVENTNOTIFIER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCEVENTNOTIFIER_HXX
 
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 887a696cb400..413ff965ea6d 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
-#define FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX
 
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -204,6 +204,6 @@ class AsyncRequests : private ::cppu::BaseMutex
 } // namespace win32
 } // namespace fpicker
 
-#endif // FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx
index a9ed6a60c07a..289179ea0254 100644
--- a/fpicker/source/win32/filepicker/comptr.hxx
+++ b/fpicker/source/win32/filepicker/comptr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPTR_HXX
-#define COMPTR_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_COMPTR_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_COMPTR_HXX
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index ee990f6e2cb6..f3eb55243ea6 100644
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _CONTROLACCESS_HXX_
-#define _CONTROLACCESS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLACCESS_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLACCESS_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index 04ba63c8b6e7..ae63ff802eb6 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTROLCOMMAND_HXX_
-#define _CONTROLCOMMAND_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMAND_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMAND_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
index c85e0a19e27d..f62cfd3a35c7 100644
--- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTROLCOMMANDREQUEST_HXX_
-#define _CONTROLCOMMANDREQUEST_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDREQUEST_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDREQUEST_HXX
 
 #include <sal/types.h>
 
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 5d03e606f7f4..2abd1e8bd54e 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTROLCOMMANDRESULT_HXX_
-#define _CONTROLCOMMANDRESULT_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDRESULT_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CONTROLCOMMANDRESULT_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx
index 49aadd7aa960..e209172a18ea 100644
--- a/fpicker/source/win32/filepicker/customcontrol.hxx
+++ b/fpicker/source/win32/filepicker/customcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CUSTOMCONTROL_HXX_
-#define _CUSTOMCONTROL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROL_HXX
 
 #include <sal/types.h>
 
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
index 5eea68099c8b..6b61253168a9 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CUSTOMCONTROLCONTAINER_HXX_
-#define _CUSTOMCONTROLCONTAINER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLCONTAINER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLCONTAINER_HXX
 
 #include "customcontrol.hxx"
 
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index e10a1b58db28..742cc7a6e3ba 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CUSTOMCONTROLFACTORY_HXX_
-#define _CUSTOMCONTROLFACTORY_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLFACTORY_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_CUSTOMCONTROLFACTORY_HXX
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
index fbe233512e63..a9f2d1a50a22 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DIALOGCUSTOMCONTROLS_HXX_
-#define _DIALOGCUSTOMCONTROLS_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIALOGCUSTOMCONTROLS_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIALOGCUSTOMCONTROLS_HXX
 
 #include "customcontrol.hxx"
 
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 61d338f8c0f2..14ab01a08b16 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DIBPREVIEW_HXX_
-#define _DIBPREVIEW_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIBPREVIEW_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_DIBPREVIEW_HXX
 
 #include "previewbase.hxx"
 #include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index 209343526218..e726b91ee660 100644
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EVENTNOTIFICATION_HXX_
-#define _EVENTNOTIFICATION_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_EVENTNOTIFICATION_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_EVENTNOTIFICATION_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
index e33523c80e80..7edac324a42c 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILEPICKEREVENTNOTIFICATION_HXX_
-#define _FILEPICKEREVENTNOTIFICATION_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKEREVENTNOTIFICATION_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKEREVENTNOTIFICATION_HXX
 
 #include "eventnotification.hxx"
 #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index d0be2441a855..10953bc09012 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILEPICKERSTATE_HXX_
-#define _FILEPICKERSTATE_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKERSTATE_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKERSTATE_HXX
 
 #include <sal/types.h>
 #include "controlcommand.hxx"
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 2ec0e4da597b..0d5604923e74 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GETFILENAMEWRAPPER_HXX_
-#define _GETFILENAMEWRAPPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_GETFILENAMEWRAPPER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_GETFILENAMEWRAPPER_HXX
 
 #include <sal/types.h>
 
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index ec6351f4231b..905bb6785646 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HELPPOPUPWINDOW_HXX_
-#define _HELPPOPUPWINDOW_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_HELPPOPUPWINDOW_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_HELPPOPUPWINDOW_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h
index d2a52d0482d6..1d8dea84b038 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PLATFORM_VISTA_H_
-#define _PLATFORM_VISTA_H_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H
 
 #pragma once
 
diff --git a/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h
index a31cbc40e037..4d4792a29dff 100644
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PLATFORM_XP_H_
-#define _PLATFORM_XP_H_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_XP_H
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_XP_H
 
 #pragma once
 
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 5eaf9bce0b35..fc05fa0013c0 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PREVIEWADAPTER_HXX_
-#define _PREVIEWADAPTER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWADAPTER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWADAPTER_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 220fdb7f6433..6a449da8210b 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PREVIEWBASE_HXX_
-#define _PREVIEWBASE_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWBASE_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PREVIEWBASE_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index 3966e1e4055e..fe4db2871222 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_FILEPICKER_SHARED_HXX
-#define FPICKER_WIN32_FILEPICKER_SHARED_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SHARED_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SHARED_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h
index 2ca8700b5047..727416e9f2a1 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FPICKER_WIN32_VISTA_TYPES_HXX
-#define FPICKER_WIN32_VISTA_TYPES_HXX
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H
+#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H
 
 #include "comptr.hxx"
 #include <shobjidl.h>
@@ -41,6 +41,6 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize
 } // namespace win32
 } // namespace fpicker
 
-#endif // FPICKER_WIN32_VISTA_TYPES_HXX
+#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index 14c06b91fadb..d08586e007d1 100644
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _FOPSERVICEINFO_HXX_
-#define _FOPSERVICEINFO_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPSERVICEINFO_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPSERVICEINFO_HXX
 
 // the service name is a description of a set of
 // interfaces (is the same as component categories in COM)
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 619ded48f5d9..721ad68d4fb8 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FOLDERPICKER_HXX_
-#define _FOLDERPICKER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOLDERPICKER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOLDERPICKER_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index 240a9f336b4a..e2fb45f87055 100644
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _FOPEVENTDISPATCHER_HXX_
-#define _FOPEVENTDISPATCHER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPEVTDISP_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOPEVTDISP_HXX
 
 #include <com/sun/star/lang/EventObject.hpp>
 
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 6469d93441b0..683c8e8209e7 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MTAFOP_HXX_
-#define _MTAFOP_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_MTAFOP_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_MTAFOP_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index b464d15874ef..1dd59cc6d61a 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _WINFOPIMPL_HXX_
-#define _WINFOPIMPL_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_WINFOPIMPL_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_WINFOPIMPL_HXX
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include "MtaFop.hxx"
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 52ed28dd15ee..11fe51813f8f 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _WINIMPLHELPER_HXX_
-#define _WINIMPLHELPER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_MISC_WINIMPLHELPER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_MISC_WINIMPLHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index d02164faf37e..32f3b118f759 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _RESOURCEPROVIDER_HXX_
-#define _RESOURCEPROVIDER_HXX_
+#ifndef INCLUDED_FPICKER_SOURCE_WIN32_MISC_RESOURCEPROVIDER_HXX
+#define INCLUDED_FPICKER_SOURCE_WIN32_MISC_RESOURCEPROVIDER_HXX
 
 #include <sal/types.h>