fixincludeguards.sh: reportdesign

44 files changed, 127 insertions, 127 deletions

diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index d5d4a244d58e..2e1b66db3e46 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_CONDITION_HXX
-#define RPTUI_CONDITION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_CONDITION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_CONDITION_HXX
 
 #include "conditionalexpression.hxx"
 
@@ -181,6 +181,6 @@ namespace rptui
 
 } // namespace rptui
 
-#endif // RPTUI_CONDITION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_CONDITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx
index 8a0c560ab0ed..57259b504684 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.hxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.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 RPTUI_GROUP_EXCHANGE_HXX
-#define RPTUI_GROUP_EXCHANGE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -41,6 +41,6 @@ namespace rptui
         virtual void        ObjectReleased() SAL_OVERRIDE;
     };
 }
-#endif // RPTUI_GROUP_EXCHANGE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 5d6bbd1a5631..a73c00934324 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_ADDFIELDWINDOW_HXX
-#define RPTUI_ADDFIELDWINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -125,6 +125,6 @@ private:
 
 } // rptui
 
-#endif // RPTUI_ADDFIELDWINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx
index ab55bc3e0f20..3a4f9b333c9b 100644
--- a/reportdesign/source/ui/inc/ColorChanger.hxx
+++ b/reportdesign/source/ui/inc/ColorChanger.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 RPTUI_COLORCHANGER_HXX
-#define RPTUI_COLORCHANGER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
 
 namespace rptui
 {
@@ -58,6 +58,6 @@ namespace rptui
         }
     };
 }
-#endif //RPTUI_COLORCHANGER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index ed6335bfb4e0..351b702b7b85 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.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 RPTUI_COLORLISTENER_HXX
-#define RPTUI_COLORLISTENER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORLISTENER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORLISTENER_HXX
 
 #include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
@@ -72,6 +72,6 @@ namespace rptui
         virtual void    setCollapsed(sal_Bool _bCollapsed);
     };
 }
-#endif // RPTUI_COLORLISTENER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx
index 5ecc99e26b8b..ce8728459eea 100644
--- a/reportdesign/source/ui/inc/ColumnInfo.hxx
+++ b/reportdesign/source/ui/inc/ColumnInfo.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 RPTUI_COLUMNINFO_HXX
-#define RPTUI_COLUMNINFO_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLUMNINFO_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLUMNINFO_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -43,6 +43,6 @@ namespace rptui
 
 } // namespace rptui
 
-#endif // RPTUI_COLUMNINFO_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLUMNINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 1719c928d99a..2a177e50d2ef 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_CONDFORMAT_HXX
-#define RPTUI_CONDFORMAT_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
 
 #include "ModuleHelper.hxx"
 
@@ -178,6 +178,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPTUI_CONDFORMAT_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index b6b453471b7a..d4a78981dac8 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_DATAPROVIDERHANDLER_HXX
-#define RPT_DATAPROVIDERHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATAPROVIDERHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATAPROVIDERHANDLER_HXX
 
 #include "sal/config.h"
 
@@ -120,6 +120,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPT_DATAPROVIDERHANDLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATAPROVIDERHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index 2fdb55654d6a..439fb41e1c6b 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RPTUI_DATETIME_HXX
-#define RPTUI_DATETIME_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -89,6 +89,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_DATETIME_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 42efb604e88f..21807cf5db8c 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.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 RPT_DEFAULTINSPECTION_HXX
-#define RPT_DEFAULTINSPECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DEFAULTINSPECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DEFAULTINSPECTION_HXX
 
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -97,6 +97,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPT_DEFAULTINSPECTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DEFAULTINSPECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 50db08572404..4b2feec22f1c 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.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 RPTUI_DESIGNVIEW_HXX
-#define RPTUI_DESIGNVIEW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX
 
 #include <dbaccess/dataview.hxx>
 #include <com/sun/star/frame/XController.hpp>
@@ -276,6 +276,6 @@ namespace rptui
 
 }   //rptui
 
-#endif // RPTUI_DESIGNVIEW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DESIGNVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx
index 90d13d45040a..e189585c63ad 100644
--- a/reportdesign/source/ui/inc/EndMarker.hxx
+++ b/reportdesign/source/ui/inc/EndMarker.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 RPTUI_ENDMARKER_HXX
-#define RPTUI_ENDMARKER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ENDMARKER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ENDMARKER_HXX
 
 #include "ColorListener.hxx"
 
@@ -41,6 +41,6 @@ namespace rptui
         virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     };
 }
-#endif // RPTUI_ENDMARKER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ENDMARKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index 952517067ec3..052206cbf9ae 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FIXEDTEXTCOLOR_HXX
-#define INCLUDED_FIXEDTEXTCOLOR_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FIXEDTEXTCOLOR_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FIXEDTEXTCOLOR_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
index 8e4358528a50..471afb32397f 100644
--- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
+++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FORMATTEDFIELDBEAUTIFIER_HXX
-#define INCLUDED_FORMATTEDFIELDBEAUTIFIER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMATTEDFIELDBEAUTIFIER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMATTEDFIELDBEAUTIFIER_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index d3b2f1088892..d0643a489bcb 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_FORMULA_HXX
-#define RPTUI_FORMULA_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMULA_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMULA_HXX
 
 #include <formula/formula.hxx>
 #include <formula/IControlReferenceHandler.hxx>
@@ -109,6 +109,6 @@ protected:
 } // rptui
 
 
-#endif // RPTUI_FORMULA_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMULA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index dcbe8ba374b2..bf384f0a0798 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_FUNCTIONHELPER_HXX
-#define RPTUI_FUNCTIONHELPER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FUNCTIONHELPER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FUNCTIONHELPER_HXX
 
 #include <formula/IFunctionDescription.hxx>
 #include <com/sun/star/report/meta/XFunctionManager.hpp>
@@ -99,6 +99,6 @@ public:
 } // rptui
 
 
-#endif //RPTUI_FUNCTIONHELPER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FUNCTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 8357a218beea..b176f1cdcd90 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_GEOMETRYHANDLER_HXX
-#define RPT_GEOMETRYHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GEOMETRYHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GEOMETRYHANDLER_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 3a952f56eb24..66e434ae7984 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.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 RPTUI_GROUPS_SORTING_HXX
-#define RPTUI_GROUPS_SORTING_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
 
 #include <vcl/floatwin.hxx>
 #include <vcl/fixed.hxx>
@@ -185,6 +185,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_GROUPS_SORTING_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx
index 7fb6d084464f..c5921dfc7afd 100644
--- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BEAUTIFIER_HXX
-#define INCLUDED_BEAUTIFIER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_IREPORTCONTROLLEROBSERVER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_IREPORTCONTROLLEROBSERVER_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 
diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx
index 7fa6c2e6a349..52ee1d3f62e8 100644
--- a/reportdesign/source/ui/inc/MarkedSection.hxx
+++ b/reportdesign/source/ui/inc/MarkedSection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPTUI_MARKEDSECTION_HXX
-#define RPTUI_MARKEDSECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 
 #include <boost/shared_ptr.hpp>
 
@@ -52,6 +52,6 @@ namespace rptui
 
 } // rptui
 
-#endif /* RPTUI_MARKEDSECTION_HXX */
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index c67312a10808..42b5fa016cb5 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.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_RPTUI_NAVIGATOR_HXX
-#define INCLUDED_RPTUI_NAVIGATOR_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 
 #include <vcl/floatwin.hxx>
 #include "ModuleHelper.hxx"
@@ -44,6 +44,6 @@ namespace rptui
 
 } // namespace rptui
 
-#endif // INCLUDED_RPTUI_NAVIGATOR_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx
index 4298af5ca28a..19a1b6c65126 100644
--- a/reportdesign/source/ui/inc/PageNumber.hxx
+++ b/reportdesign/source/ui/inc/PageNumber.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 RPTUI_PAGENUMBER_HXX
-#define RPTUI_PAGENUMBER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -65,6 +65,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_PAGENUMBER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index c41699f90bca..b6ff75a8d2d5 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RPT_REPORTCOMPONENTHANDLER_HXX
-#define RPT_REPORTCOMPONENTHANDLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCOMPONENTHANDLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCOMPONENTHANDLER_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -106,6 +106,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPT_REPORTCOMPONENTHANDLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCOMPONENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 89b334ddd188..95e5eff51cce 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.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 RPTUI_REPORTCONTROLLER_HXX
-#define RPTUI_REPORTCONTROLLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
 
 #include "DesignView.hxx"
 #include "ModuleHelper.hxx"
@@ -469,6 +469,6 @@ namespace rptui
         void            addUndoAction( SfxUndoAction* i_pAction );
     };
 }
-#endif // RPTUI_REPORTCONTROLLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 947d10d0ef97..125f4fabb60d 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.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_REPORTCONTROLLEROBSERVER_HXX
-#define INCLUDED_REPORTCONTROLLEROBSERVER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLEROBSERVER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLEROBSERVER_HXX
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
@@ -112,7 +112,7 @@ namespace rptui
 
 } // namespace rptui
 
-#endif /* INCLUDED_REPORTCONTROLLEROBSERVER_HXX */
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLEROBSERVER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportDefines.hxx b/reportdesign/source/ui/inc/ReportDefines.hxx
index 9f9007d0ad4b..0cca0d817f5b 100644
--- a/reportdesign/source/ui/inc/ReportDefines.hxx
+++ b/reportdesign/source/ui/inc/ReportDefines.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 RPTUI_REPORT_DEFINES_HXX
-#define RPTUI_REPORT_DEFINES_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTDEFINES_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTDEFINES_HXX
 
 namespace rptui
 {
@@ -28,6 +28,6 @@ namespace rptui
 #define REPORT_EXTRA_SPACE           10
 
 }
-#endif //RPTUI_REPORT_DEFINES_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTDEFINES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx
index c289dd1383da..75519ca181db 100644
--- a/reportdesign/source/ui/inc/ReportRuler.hxx
+++ b/reportdesign/source/ui/inc/ReportRuler.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 RPTUI_RULER_HXX
-#define RPTUI_RULER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTRULER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTRULER_HXX
 
 #include <vcl/window.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -52,6 +52,6 @@ namespace rptui
 
 } // rptui
 
-#endif // RPTUI_RULER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTRULER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index 59711714891f..e282695c9734 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.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 REPORT_REPORTSECTION_HXX
-#define REPORT_REPORTSECTION_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTSECTION_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTSECTION_HXX
 
 #include <vcl/window.hxx>
 #include "RptPage.hxx"
@@ -165,6 +165,6 @@ namespace rptui
 
 }   //rptui
 
-#endif // REPORT_REPORTSECTION_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index bf48dcf23c18..7dcb6453c80a 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.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 RPTUI_REPORT_WINDOW_HXX
-#define RPTUI_REPORT_WINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTWINDOW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTWINDOW_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include "ReportDefines.hxx"
@@ -226,6 +226,6 @@ namespace rptui
 
 }   //rptui
 
-#endif // RPTUI_REPORT_WINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index ec1d37ad31e6..1fd0ea9aa58d 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.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 RPTUI_UNDO_HXX
-#define RPTUI_UNDO_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
 
 #include "UndoActions.hxx"
 #include <functional>
@@ -138,6 +138,6 @@ namespace rptui
         virtual void        Redo() SAL_OVERRIDE;
     };
 }
-#endif // RPTUI_UNDO_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 0ca6ba62c153..374370d9474f 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.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 RPTUI_SCROLLHELPER_HXX
-#define RPTUI_SCROLLHELPER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SCROLLHELPER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SCROLLHELPER_HXX
 
 #include <vcl/scrbar.hxx>
 #include <com/sun/star/report/XSection.hpp>
@@ -215,6 +215,6 @@ namespace rptui
         sal_uInt16 getZoomFactor(SvxZoomType _eType) const;
     };
 }
-#endif // RPTUI_SCROLLHELPER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SCROLLHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx
index 3e86257835b2..0cfc1ed3a714 100644
--- a/reportdesign/source/ui/inc/SectionView.hxx
+++ b/reportdesign/source/ui/inc/SectionView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_SECTIONVIEW_HXX
-#define _REPORT_SECTIONVIEW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONVIEW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONVIEW_HXX
 
 
 #include <svx/svdview.hxx>
@@ -66,6 +66,6 @@ public:
     bool IsDragResize() const;
 };
 }
-#endif //_REPORT_SECTIONVIEW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 1741d7f223c3..8db95362e304 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.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 RPTUI_SECTIONWINDOW_HXX
-#define RPTUI_SECTIONWINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONWINDOW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONWINDOW_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include <vcl/window.hxx>
@@ -126,6 +126,6 @@ namespace rptui
 
 } // rptui
 
-#endif // RPTUI_SECTIONWINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_SECTIONWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 7851b6dad4bd..2ae119348a87 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.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 RPTUI_STARTMARKER_HXX
-#define RPTUI_STARTMARKER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
 
 #include <osl/interlck.h>
 #include <svtools/ruler.hxx>
@@ -74,6 +74,6 @@ namespace rptui
         void            zoom(const Fraction& _aZoom);
     };
 }
-#endif // RPTUI_STARTMARKER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 204b55864527..5f08bb180bee 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.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 RPTUI_UITOOLS_HXX
-#define RPTUI_UITOOLS_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
 
 #include <com/sun/star/report/XGroup.hpp>
 #include <com/sun/star/report/XReportControlFormat.hpp>
@@ -178,6 +178,6 @@ namespace rptui
     */
     void setZoomFactor(const Fraction& _aZoom,Window& _rWindow);
 }
-#endif //RPTUI_UITOOLS_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index a4741d84ea86..e074cadeb146 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.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 RPTUI_VIEWSWINDOW_HXX
-#define RPTUI_VIEWSWINDOW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_VIEWSWINDOW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_VIEWSWINDOW_HXX
 
 #include <com/sun/star/report/XSection.hpp>
 #include <vcl/window.hxx>
@@ -343,6 +343,6 @@ namespace rptui
 
 } // rptui
 
-#endif // RPTUI_VIEWSWINDOW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_VIEWSWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx
index ad5657536868..9c448a29fc7b 100644
--- a/reportdesign/source/ui/inc/dlgedclip.hxx
+++ b/reportdesign/source/ui/inc/dlgedclip.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_RPTUICLIP_HXX
-#define _REPORT_RPTUICLIP_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
 
 #include <svtools/transfer.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -75,6 +75,6 @@ private:
     TSectionElements    m_aCopyElements;
 };
 }
-#endif // _REPORT_RPTUICLIP_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx
index bf2ca09c3457..1f3c146856cc 100644
--- a/reportdesign/source/ui/inc/dlgedfac.hxx
+++ b/reportdesign/source/ui/inc/dlgedfac.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_RPTUIFAC_HXX
-#define _REPORT_RPTUIFAC_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
 
 
 #include <svx/svdobj.hxx>
@@ -37,6 +37,6 @@ public:
     DECL_LINK( MakeObject, SdrObjFactory * );
 };
 }
-#endif // _REPORT_RPTUIFAC_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index a975f0a21850..3b22777b5637 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.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 _REPORT_RPTUIFUNC_HXX
-#define _REPORT_RPTUIFUNC_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
 
 #include <vcl/timer.hxx>
 
@@ -149,6 +149,6 @@ public:
 };
 
 }
-#endif //_REPORT_RPTUIFUNC_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx
index f3eb887aeea1..672207469db0 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.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 RPTUI_DLGPAGE_HXX
-#define RPTUI_DLGPAGE_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGPAGE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGPAGE_HXX
 
 #include <sfx2/tabdlg.hxx>
 
@@ -42,6 +42,6 @@ public:
 
 } // namespace rptui
 
-#endif // RPTUI_DLGPAGE_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 65a9942d479d..79f479cd790b 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.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 RPTUI_METADATA_HXX_
-#define RPTUI_METADATA_HXX_
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
 
 #include "ModuleHelper.hxx"
 
@@ -148,6 +148,6 @@ namespace rptui
 } // namespace rptui
 
 
-#endif // RPTUI_METADATA_HXX_
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index cf22ed751ac3..051fc9a98c3b 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _REPORT_PROPBRW_HXX
-#define _REPORT_PROPBRW_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -106,6 +106,6 @@ private:
 
 } // rptui
 
-#endif // _REPORT_PROPBRW_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx
index 0dd86d4d63b1..5be27b9e9ac8 100644
--- a/reportdesign/source/ui/inc/statusbarcontroller.hxx
+++ b/reportdesign/source/ui/inc/statusbarcontroller.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 RPTUI_STATUSBARCONTROLLER_HXX
-#define RPTUI_STATUSBARCONTROLLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STATUSBARCONTROLLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STATUSBARCONTROLLER_HXX
 
 #include <svtools/statusbarcontroller.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index 39b2dc2604b5..a4a668c1994f 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.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 RPTUI_TOOLBOXCONTROLLER_HXX
-#define RPTUI_TOOLBOXCONTROLLER_HXX
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 #include <sal/config.h>
 
@@ -82,6 +82,6 @@ namespace rptui
 
 } // rptui
 
-#endif //RPTUI_TOOLBOXCONTROLLER_HXX
+#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */