From bdf7b2715ef7463b46cfdf334cf7699ac063a9b4 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Tue, 5 Nov 2013 02:31:05 +0100
Subject: fixincludeguards.sh: forms

Change-Id: I634371fcd867f20e20384f75d613dab5f69a246c
---
 forms/source/component/BaseListBox.hxx                      | 6 +++---
 forms/source/component/Button.hxx                           | 6 +++---
 forms/source/component/CheckBox.hxx                         | 6 +++---
 forms/source/component/Columns.hxx                          | 6 +++---
 forms/source/component/ComboBox.hxx                         | 6 +++---
 forms/source/component/Currency.hxx                         | 6 +++---
 forms/source/component/DatabaseForm.hxx                     | 6 +++---
 forms/source/component/Date.hxx                             | 6 +++---
 forms/source/component/Edit.hxx                             | 6 +++---
 forms/source/component/EditBase.hxx                         | 6 +++---
 forms/source/component/EventThread.hxx                      | 6 +++---
 forms/source/component/File.hxx                             | 6 +++---
 forms/source/component/Filter.hxx                           | 6 +++---
 forms/source/component/FixedText.hxx                        | 6 +++---
 forms/source/component/FormattedField.hxx                   | 6 +++---
 forms/source/component/FormattedFieldWrapper.hxx            | 6 +++---
 forms/source/component/GroupBox.hxx                         | 6 +++---
 forms/source/component/GroupManager.hxx                     | 6 +++---
 forms/source/component/Hidden.hxx                           | 6 +++---
 forms/source/component/ImageButton.hxx                      | 6 +++---
 forms/source/component/ImageControl.hxx                     | 6 +++---
 forms/source/component/ListBox.hxx                          | 6 +++---
 forms/source/component/Numeric.hxx                          | 6 +++---
 forms/source/component/Pattern.hxx                          | 6 +++---
 forms/source/component/RadioButton.hxx                      | 6 +++---
 forms/source/component/Time.hxx                             | 6 +++---
 forms/source/component/cachedrowset.hxx                     | 6 +++---
 forms/source/component/clickableimage.hxx                   | 6 +++---
 forms/source/component/entrylisthelper.hxx                  | 6 +++---
 forms/source/component/errorbroadcaster.hxx                 | 6 +++---
 forms/source/component/imgprod.hxx                          | 6 +++---
 forms/source/component/navigationbar.hxx                    | 6 +++---
 forms/source/component/refvaluecomponent.hxx                | 6 +++---
 forms/source/component/scrollbar.hxx                        | 6 +++---
 forms/source/component/spinbutton.hxx                       | 6 +++---
 forms/source/inc/FormComponent.hxx                          | 6 +++---
 forms/source/inc/InterfaceContainer.hxx                     | 6 +++---
 forms/source/inc/cloneable.hxx                              | 6 +++---
 forms/source/inc/commanddescriptionprovider.hxx             | 6 +++---
 forms/source/inc/commandimageprovider.hxx                   | 6 +++---
 forms/source/inc/componenttools.hxx                         | 6 +++---
 forms/source/inc/controlfeatureinterception.hxx             | 6 +++---
 forms/source/inc/featuredispatcher.hxx                      | 6 +++---
 forms/source/inc/formcontrolfont.hxx                        | 6 +++---
 forms/source/inc/formnavigation.hxx                         | 6 +++---
 forms/source/inc/frm_module.hxx                             | 6 +++---
 forms/source/inc/frm_resource.hxx                           | 6 +++---
 forms/source/inc/frm_strings.hxx                            | 6 +++---
 forms/source/inc/ids.hxx                                    | 6 +++---
 forms/source/inc/limitedformats.hxx                         | 6 +++---
 forms/source/inc/listenercontainers.hxx                     | 6 +++---
 forms/source/inc/property.hxx                               | 6 +++---
 forms/source/inc/propertybaghelper.hxx                      | 6 +++---
 forms/source/inc/resettable.hxx                             | 6 +++---
 forms/source/inc/services.hxx                               | 6 +++---
 forms/source/inc/togglestate.hxx                            | 6 +++---
 forms/source/inc/urltransformer.hxx                         | 6 +++---
 forms/source/inc/windowstateguard.hxx                       | 6 +++---
 forms/source/richtext/attributedispatcher.hxx               | 6 +++---
 forms/source/richtext/clipboarddispatcher.hxx               | 6 +++---
 forms/source/richtext/featuredispatcher.hxx                 | 6 +++---
 forms/source/richtext/parametrizedattributedispatcher.hxx   | 6 +++---
 forms/source/richtext/richtextcontrol.hxx                   | 6 +++---
 forms/source/richtext/richtextengine.hxx                    | 6 +++---
 forms/source/richtext/richtextimplcontrol.hxx               | 6 +++---
 forms/source/richtext/richtextmodel.hxx                     | 6 +++---
 forms/source/richtext/richtextunowrapper.hxx                | 6 +++---
 forms/source/richtext/richtextvclcontrol.hxx                | 6 +++---
 forms/source/richtext/richtextviewport.hxx                  | 6 +++---
 forms/source/richtext/rtattributehandler.hxx                | 6 +++---
 forms/source/richtext/rtattributes.hxx                      | 6 +++---
 forms/source/richtext/specialdispatchers.hxx                | 6 +++---
 forms/source/richtext/textattributelistener.hxx             | 6 +++---
 forms/source/runtime/formoperations.hxx                     | 6 +++---
 forms/source/solar/component/navbarcontrol.hxx              | 6 +++---
 forms/source/solar/inc/navtoolbar.hxx                       | 6 +++---
 forms/source/xforms/NameContainer.hxx                       | 4 ++--
 forms/source/xforms/binding.hxx                             | 4 ++--
 forms/source/xforms/boolexpression.hxx                      | 4 ++--
 forms/source/xforms/collection.hxx                          | 4 ++--
 forms/source/xforms/computedexpression.hxx                  | 4 ++--
 forms/source/xforms/convert.hxx                             | 4 ++--
 forms/source/xforms/datatyperepository.hxx                  | 6 +++---
 forms/source/xforms/datatypes.hxx                           | 6 +++---
 forms/source/xforms/enumeration.hxx                         | 4 ++--
 forms/source/xforms/evaluationcontext.hxx                   | 4 ++--
 forms/source/xforms/mip.hxx                                 | 4 ++--
 forms/source/xforms/model.hxx                               | 4 ++--
 forms/source/xforms/model_helper.hxx                        | 4 ++--
 forms/source/xforms/namedcollection.hxx                     | 4 ++--
 forms/source/xforms/pathexpression.hxx                      | 4 ++--
 forms/source/xforms/propertysetbase.hxx                     | 4 ++--
 forms/source/xforms/resourcehelper.hxx                      | 4 ++--
 forms/source/xforms/submission.hxx                          | 4 ++--
 forms/source/xforms/submission/serialization.hxx            | 4 ++--
 forms/source/xforms/submission/serialization_app_xml.hxx    | 4 ++--
 forms/source/xforms/submission/serialization_urlencoded.hxx | 4 ++--
 forms/source/xforms/submission/submission.hxx               | 4 ++--
 forms/source/xforms/submission/submission_get.hxx           | 4 ++--
 forms/source/xforms/submission/submission_post.hxx          | 4 ++--
 forms/source/xforms/submission/submission_put.hxx           | 4 ++--
 forms/source/xforms/unohelper.hxx                           | 4 ++--
 forms/source/xforms/warnings_guard_unicode_regex.h          | 6 +++---
 forms/source/xforms/xformsevent.hxx                         | 4 ++--
 forms/source/xforms/xmlhelper.hxx                           | 4 ++--
 105 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx
index 528c9e316ecd..672594a70683 100644
--- a/forms/source/component/BaseListBox.hxx
+++ b/forms/source/component/BaseListBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_BASELISTBOX_HXX_
-#define _FORMS_BASELISTBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX
 
 //.........................................................................
 namespace frm
@@ -31,6 +31,6 @@ const sal_uInt16 BOUNDCOLUMN     =  0x0001;
 }
 //.........................................................................
 
-#endif // _FORMS_BASELISTBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index cc8090d105ae..7845413ec913 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_BUTTON_HXX_
-#define _FRM_BUTTON_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
 
 #include "clickableimage.hxx"
 #include "togglestate.hxx"
@@ -198,6 +198,6 @@ private:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_BUTTON_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index 8cc95234d11a..ba729be6bd65 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_CHECKBOX_HXX_
-#define _FORMS_CHECKBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX
 
 #include "refvaluecomponent.hxx"
 
@@ -80,6 +80,6 @@ public:
 }
 //.........................................................................
 
-#endif // _FORMS_CHECKBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 8313daddc6ef..a4892cca50c9 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_COLUMNS_HXX
-#define _FRM_COLUMNS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 
 #include "cloneable.hxx"
 #include "frm_strings.hxx"
@@ -201,7 +201,7 @@ DECL_COLUMN(ComboBoxColumn)
 DECL_COLUMN(ListBoxColumn)
 DECL_COLUMN(FormattedFieldColumn)
 
-#endif // _FRM_COLUMNS_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 
 //.........................................................................
 }   // namespace frm
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index bd6abc7386d2..1fefa8453686 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_COMBOBOX_HXX_
-#define _FORMS_COMBOBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
 
 #include "FormComponent.hxx"
 #include "errorbroadcaster.hxx"
@@ -162,6 +162,6 @@ public:
 }
 //.........................................................................
 
-#endif // _FORMS_COMBOBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index c2eb14694cb4..606ae9100008 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_CURRENCY_HXX_
-#define _FORMS_CURRENCY_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX
 
 #include "EditBase.hxx"
 
@@ -89,6 +89,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_CURRENCY_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 17ca79534f76..cbd685c3e416 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_DATABASEFORM_HXX_
-#define _FRM_DATABASEFORM_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
 #include "propertybaghelper.hxx"
 #include <com/sun/star/sdbc/XDataSource.hpp>
@@ -554,7 +554,7 @@ inline void ODatabaseForm::submitNBC(const ::com::sun::star::uno::Reference< ::c
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_DATABASEFORM_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index a1cc55eac4f5..6d15c4ee4337 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_DATE_HXX_
-#define _FORMS_DATE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
 
 #include "EditBase.hxx"
 #include "limitedformats.hxx"
@@ -121,6 +121,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_DATE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index acefa318ee17..4e280eda5cc0 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_EDIT_HXX_
-#define _FORMS_EDIT_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
 
 #include "EditBase.hxx"
 
@@ -176,6 +176,6 @@ private:
 }
 //.........................................................................
 
-#endif // _FORMS_EDIT_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 3d22332657b5..fd5240c6d929 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_EDITBASE_HXX_
-#define _FORMS_EDITBASE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
 
 #include "FormComponent.hxx"
 #include <com/sun/star/util/XNumberFormatter.hpp>
@@ -99,6 +99,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FORMS_EDITBASE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index ee0e71ecbda4..0d34521a8a6b 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_EVENT_THREAD_HXX_
-#define _FRM_EVENT_THREAD_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
@@ -112,6 +112,6 @@ private:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_EVENT_THREAD_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 992e90776848..494b8fa430ab 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FILE_HXX_
-#define _FORMS_FILE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
 
 #include "FormComponent.hxx"
 
@@ -91,6 +91,6 @@ protected:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_FILE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index e6ca4d6033cb..802b4ae9f414 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_COMPONENT_FILTER_HXX
-#define FORMS_COMPONENT_FILTER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -146,6 +146,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_COMPONENT_FILTER_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index bfea6178ea07..a31c88de7711 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FIXEDTEXT_HXX_
-#define _FORMS_FIXEDTEXT_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
 
 #include "FormComponent.hxx"
 
@@ -59,6 +59,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FORMS_FIXEDTEXT_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 4507225c70c1..1ea82f6989bb 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FORMATTEDFIELD_HXX_
-#define _FORMS_FORMATTEDFIELD_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
 
 #include "EditBase.hxx"
 #include <tools/link.hxx>
@@ -187,6 +187,6 @@ namespace frm
 }
 //.........................................................................
 
-#endif // _FORMS_FORMATTEDFIELD_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 0c28f38fe9ca..7158b966c37c 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_FORMATTED_FIELD_WRAPPER_HXX_
-#define _FRM_FORMATTED_FIELD_WRAPPER_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 
 #include "FormComponent.hxx"
 #include <cppuhelper/implbase3.hxx>
@@ -90,6 +90,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FRM_FORMATTED_FIELD_WRAPPER_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index 4509a28de662..d5f9f88f431e 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_GROUPBOX_HXX_
-#define _FORMS_GROUPBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
 
 #include "FormComponent.hxx"
 
@@ -72,6 +72,6 @@ public:
 }
 //.........................................................................
 
-#endif // _FORMS_GROUPBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index c9fa1ae639ba..7747c41f6221 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_GROUPMANAGER_HXX_
-#define _FRM_GROUPMANAGER_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX
 
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -220,6 +220,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_GROUPMANAGER_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 08d77d613c04..5452ece3565c 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_HIDDEN_HXX_
-#define _FORMS_HIDDEN_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 
 #include "FormComponent.hxx"
 
@@ -68,7 +68,7 @@ protected:
     DECLARE_XCLONEABLE( );
 };
 
-#endif // _FORMS_HIDDEN_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 
 //.........................................................................
 }
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 40ebaac17e11..32467b4dba13 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_IMAGE_BUTTON_HXX_
-#define _FRM_IMAGE_BUTTON_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX
 
 #include "clickableimage.hxx"
 #include <com/sun/star/awt/XMouseListener.hpp>
@@ -95,6 +95,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_IMAGE_BUTTON_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 4bca62985745..6836a737705f 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_IMAGE_CONTROL_HXX_
-#define _FRM_IMAGE_CONTROL_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
 
 #include "FormComponent.hxx"
 #include "imgprod.hxx"
@@ -198,6 +198,6 @@ private:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_IMAGE_CONTROL_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 244821841d1a..4cd42229a88f 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_LISTBOX_HXX_
-#define _FORMS_LISTBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
 
 #include "FormComponent.hxx"
 #include "cachedrowset.hxx"
@@ -335,6 +335,6 @@ private:
 }
 //.........................................................................
 
-#endif // _FORMS_LISTBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index bdb0a399c18a..fa7284a8008b 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_NUMERIC_HXX_
-#define _FORMS_NUMERIC_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX
 
 #include "EditBase.hxx"
 
@@ -87,6 +87,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_NUMERIC_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index 43975ea2415a..8de1e00a8b89 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_PATTERN_HXX_
-#define _FORMS_PATTERN_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX
 
 #include "EditBase.hxx"
 
@@ -96,6 +96,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_PATTERN_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index f1d39d133ec5..1279173af694 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_RADIOBUTTON_HXX_
-#define _FORMS_RADIOBUTTON_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX
 
 #include "refvaluecomponent.hxx"
 
@@ -101,6 +101,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FORMS_RADIOBUTTON_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 74cf5ac35724..07d3deed35a9 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_TIME_HXX_
-#define _FORMS_TIME_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
 
 #include "EditBase.hxx"
 #include "limitedformats.hxx"
@@ -121,6 +121,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_TIME_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx
index e6dcc42fabbb..a765c5871b6d 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CACHEDROWSET_HXX
-#define CACHEDROWSET_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -83,6 +83,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // CACHEDROWSET_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index ec6593e5be71..1b88d5d0cf1f 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_CLICKABLEIMAGE_HXX
-#define FORMS_SOURCE_CLICKABLEIMAGE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
 
 #include "FormComponent.hxx"
 #include "EventThread.hxx"
@@ -281,6 +281,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_SOURCE_CLICKABLEIMAGE_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 72a159f0330a..183e4816f8d7 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_ENTRYLISTHELPER_HXX
-#define FORMS_ENTRYLISTHELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX
 
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
@@ -185,6 +185,6 @@ namespace frm
 //.........................................................................
 
 
-#endif // FORMS_ENTRYLISTHELPER_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index 398d86be3593..85fb9d514d3a 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_ERRORBROADCASTER_HXX
-#define FORMS_ERRORBROADCASTER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
@@ -62,6 +62,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_ERRORBROADCASTER_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 3bcbc3222632..4c2f163537e3 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PRODUCE_HXX
-#define _PRODUCE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
@@ -96,6 +96,6 @@ public:
 
 };
 
-#endif // _PRODUCE_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 7a7278f89b18..a8da8d876fea 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_COMPONENT_NAVIGATION_BAR_HXX
-#define FORMS_COMPONENT_NAVIGATION_BAR_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
 
 #include "FormComponent.hxx"
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -126,6 +126,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_COMPONENT_NAVIGATION_BAR_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index 7b256464b4f7..5b038a73e70a 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
-#define FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
 
 #include "FormComponent.hxx"
 #include "togglestate.hxx"
@@ -94,6 +94,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index b11706f93b22..ac14d0ab171f 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.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 FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
-#define FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
 #include "FormComponent.hxx"
 #include "frm_module.hxx"
@@ -90,6 +90,6 @@ namespace frm
 } // namespacefrm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 3b8ec0d35aed..dfbff0528623 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.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 FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
-#define FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
 
 #include "FormComponent.hxx"
 #include "frm_module.hxx"
@@ -90,6 +90,6 @@ namespace frm
 } // namespacefrm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index a89043f36de7..dfb830505aff 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FORMCOMPONENT_HXX_
-#define _FORMS_FORMCOMPONENT_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX
 
 #include "cloneable.hxx"
 #include "ids.hxx"
@@ -1312,6 +1312,6 @@ private:
 }
 //.........................................................................
 
-#endif // _FORMS_FORMCOMPONENT_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index d3a3df72486a..695e518f97cc 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_INTERFACE_CONTAINER_HXX_
-#define _FRM_INTERFACE_CONTAINER_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
+#define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
 
 #include <boost/unordered_map.hpp>
 #include <comphelper/stl_types.hxx>
@@ -315,6 +315,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif          // _FRM_INTERFACE_CONTAINER_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/cloneable.hxx b/forms/source/inc/cloneable.hxx
index 72312eca1279..ffc6d0a8d778 100644
--- a/forms/source/inc/cloneable.hxx
+++ b/forms/source/inc/cloneable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_COMPONENT_CLONEABLE_HXX
-#define FORMS_COMPONENT_CLONEABLE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_CLONEABLE_HXX
+#define INCLUDED_FORMS_SOURCE_INC_CLONEABLE_HXX
 
 #include <com/sun/star/uno/XAggregation.hpp>
 
@@ -43,6 +43,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_COMPONENT_CLONEABLE_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_CLONEABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx
index 05c16ac6c222..9ece1a93190d 100644
--- a/forms/source/inc/commanddescriptionprovider.hxx
+++ b/forms/source/inc/commanddescriptionprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMMANDDESCRIPTIONPROVIDER_HXX
-#define COMMANDDESCRIPTIONPROVIDER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_COMMANDDESCRIPTIONPROVIDER_HXX
+#define INCLUDED_FORMS_SOURCE_INC_COMMANDDESCRIPTIONPROVIDER_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -56,6 +56,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // COMMANDDESCRIPTIONPROVIDER_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_COMMANDDESCRIPTIONPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index eefa89df2a6b..d50f60af298e 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMMANDIMAGEPROVIDER_HXX
-#define COMMANDIMAGEPROVIDER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_COMMANDIMAGEPROVIDER_HXX
+#define INCLUDED_FORMS_SOURCE_INC_COMMANDIMAGEPROVIDER_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -65,6 +65,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // COMMANDIMAGEPROVIDER_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_COMMANDIMAGEPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx
index 7f62f9b28e6a..d5ffe7f7a564 100644
--- a/forms/source/inc/componenttools.hxx
+++ b/forms/source/inc/componenttools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
-#define FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
+#define INCLUDED_FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
 
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -91,6 +91,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_COMPONENTTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index b189ed4f652f..c8d8560b1469 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
-#define FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
+#define INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
@@ -89,6 +89,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx
index b24604e4564f..70b1c0a50280 100644
--- a/forms/source/inc/featuredispatcher.hxx
+++ b/forms/source/inc/featuredispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOLAR_DISPATCHER_HXX
-#define FORMS_SOLAR_DISPATCHER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_FEATUREDISPATCHER_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FEATUREDISPATCHER_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -102,6 +102,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_SOLAR_DISPATCHER_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_FEATUREDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index d2dbaa8f57fd..4e802baf4f5a 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_COMPONENT_FORMCONTROLFONT_HXX
-#define FORMS_SOURCE_COMPONENT_FORMCONTROLFONT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX
 
 #include <com/sun/star/io/XObjectOutputStream.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -90,6 +90,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_FORMCONTROLFONT_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 0c20c06a3418..d383b0d1eb29 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_FORM_NAVIGATION_HXX
-#define FORMS_FORM_NAVIGATION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX
 
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
@@ -229,6 +229,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_FORM_NAVIGATION_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_FORMNAVIGATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/frm_module.hxx b/forms/source/inc/frm_module.hxx
index c914a1ef8d1f..9a6f7ee742d1 100644
--- a/forms/source/inc/frm_module.hxx
+++ b/forms/source/inc/frm_module.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FRM_MODULE_HXX
-#define FRM_MODULE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_FRM_MODULE_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FRM_MODULE_HXX
 
 #define FORMS_MODULE_INCLUDE_CONTEXT
     #define FORMS_MODULE_NAMESPACE frm
     #include "forms_module.hxx"
 #undef FORMS_MODULE_INCLUDE_CONTEXT
 
-#endif // FRM_MODULE_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_FRM_MODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index e8f5cf9c3c94..17bb86d457e4 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_RESOURCE_HXX_
-#define _FRM_RESOURCE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -65,6 +65,6 @@ namespace frm
 }
 //.........................................................................
 
-#endif // _FRM_RESOURCE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 21718153178b..60e4e2c8d145 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FRM_STRINGS_HXX
-#define FRM_STRINGS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX
+#define INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -299,6 +299,6 @@ namespace frm
 //..............................................................................
 
 
-#endif // FRM_STRINGS_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/ids.hxx b/forms/source/inc/ids.hxx
index 61cad8aff737..86ab36bb7f69 100644
--- a/forms/source/inc/ids.hxx
+++ b/forms/source/inc/ids.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_IDS_HXX_
-#define _FRM_IDS_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_IDS_HXX
+#define INCLUDED_FORMS_SOURCE_INC_IDS_HXX
 
 #include <unotools/idhelper.hxx>
 
 DECLARE_IMPLEMENTATIONID_HELPER(frm, OImplementationIds)
 
-#endif // _FRM_IDS_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_IDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx
index 9f22b1832bb6..a5b6c67a5004 100644
--- a/forms/source/inc/limitedformats.hxx
+++ b/forms/source/inc/limitedformats.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_LIMITED_FORMATS_HXX_
-#define _FORMS_LIMITED_FORMATS_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_LIMITEDFORMATS_HXX
+#define INCLUDED_FORMS_SOURCE_INC_LIMITEDFORMATS_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
@@ -93,6 +93,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_LIMITED_FORMATS_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_LIMITEDFORMATS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index 1e9809b390ab..a453c11c0d65 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
-#define FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
+#define INCLUDED_FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
 
 #include <com/sun/star/form/XResetListener.hpp>
 #include <comphelper/listenernotification.hxx>
@@ -126,6 +126,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_LISTENERCONTAINERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index cd5ef0a92ae3..8bf420c4d3d0 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_PROPERTY_HXX_
-#define _FRM_PROPERTY_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
+#define INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -226,6 +226,6 @@ public:
 }
 //... namespace frm .......................................................
 
-#endif // _FRM_PROPERTY_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index 07d1e65f8aad..50c3e319b08a 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_PROPERTYBAGHELPER_HXX
-#define FORMS_PROPERTYBAGHELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_PROPERTYBAGHELPER_HXX
+#define INCLUDED_FORMS_SOURCE_INC_PROPERTYBAGHELPER_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
@@ -155,6 +155,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_PROPERTYBAGHELPER_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_PROPERTYBAGHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx
index b002f1b64b4f..e486dd225303 100644
--- a/forms/source/inc/resettable.hxx
+++ b/forms/source/inc/resettable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_RESETTABLE_HXX
-#define FORMS_RESETTABLE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_RESETTABLE_HXX
+#define INCLUDED_FORMS_SOURCE_INC_RESETTABLE_HXX
 
 #include <com/sun/star/form/XResetListener.hpp>
 
@@ -64,6 +64,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_RESETTABLE_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_RESETTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index 446ae2435747..f1cba8476be2 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_SERVICES_HXX_
-#define _FRM_SERVICES_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX
+#define INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX
 
 #include <rtl/ustring.hxx>
 #include "frm_strings.hxx"
@@ -216,6 +216,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_SERVICES_HXX_
+#endif // INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/togglestate.hxx b/forms/source/inc/togglestate.hxx
index daa1ae1146e3..064450dd3e42 100644
--- a/forms/source/inc/togglestate.hxx
+++ b/forms/source/inc/togglestate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_TOGGLESTATE_HXX
-#define FORMS_TOGGLESTATE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_TOGGLESTATE_HXX
+#define INCLUDED_FORMS_SOURCE_INC_TOGGLESTATE_HXX
 
 //........................................................................
 namespace frm
@@ -31,6 +31,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_TOGGLESTATE_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_TOGGLESTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx
index a52b60974c98..dd62ac4b6b7c 100644
--- a/forms/source/inc/urltransformer.hxx
+++ b/forms/source/inc/urltransformer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_INC_URLTRANSFORMER_HXX
-#define FORMS_SOURCE_INC_URLTRANSFORMER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_URLTRANSFORMER_HXX
+#define INCLUDED_FORMS_SOURCE_INC_URLTRANSFORMER_HXX
 
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -73,6 +73,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_INC_URLTRANSFORMER_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_URLTRANSFORMER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx
index 28cd0b255d2d..6d65cdd79d3a 100644
--- a/forms/source/inc/windowstateguard.hxx
+++ b/forms/source/inc/windowstateguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_WINDOWSTATEGUARD_HXX
-#define FORMS_WINDOWSTATEGUARD_HXX
+#ifndef INCLUDED_FORMS_SOURCE_INC_WINDOWSTATEGUARD_HXX
+#define INCLUDED_FORMS_SOURCE_INC_WINDOWSTATEGUARD_HXX
 
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -69,6 +69,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_WINDOWSTATEGUARD_HXX
+#endif // INCLUDED_FORMS_SOURCE_INC_WINDOWSTATEGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx
index b78386ba9167..3e6c0d33de36 100644
--- a/forms/source/richtext/attributedispatcher.hxx
+++ b/forms/source/richtext/attributedispatcher.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 FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX
-#define FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX
 
 #include "featuredispatcher.hxx"
 #include "rtattributes.hxx"
@@ -92,6 +92,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_ATTRIBUTEDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx
index 6edc6a9bd980..b584b54fdb6a 100644
--- a/forms/source/richtext/clipboarddispatcher.hxx
+++ b/forms/source/richtext/clipboarddispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX
-#define FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX
 
 #include "featuredispatcher.hxx"
 #include <tools/link.hxx>
@@ -95,6 +95,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_CLIPBOARDDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index e6ed7faff4d6..b355f58aa676 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
-#define FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -93,6 +93,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_FEATUREDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx
index f465d539dc32..606ffc6cfcf7 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.hxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX
-#define FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX
 
 #include "attributedispatcher.hxx"
 
@@ -63,6 +63,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_PARAMETRIZEDATTRIBUTEDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 5dd61be825d0..5888deff7792 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX
 
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
@@ -142,6 +142,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index cf03daba4e00..40e706fda17b 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.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 FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
 
 #include <editeng/editeng.hxx>
 #include <tools/link.hxx>
@@ -82,6 +82,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 536f8a2c074a..c953185b9a2b 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.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 FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTOL_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTOL_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTROL_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTROL_HXX
 
 #include "rtattributehandler.hxx"
 #include "richtextviewport.hxx"
@@ -184,6 +184,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTOL_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTIMPLCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 75cab24a6466..e4e8aeb35b31 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.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 FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
 
 #include "FormComponent.hxx"
 #include "frm_module.hxx"
@@ -180,6 +180,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx
index 297edbe3f7b3..a92128fdedac 100644
--- a/forms/source/richtext/richtextunowrapper.hxx
+++ b/forms/source/richtext/richtextunowrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
 
 #include <editeng/unotext.hxx>
 #include <editeng/unoedsrc.hxx>
@@ -89,6 +89,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index d9cbf81fd321..dcbb3ee41b4b 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.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 FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -126,6 +126,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index 006f243ba957..63cff4f7b677 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.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 FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX
-#define FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX
 
 #include <vcl/ctrl.hxx>
 
@@ -68,6 +68,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVIEWPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index ff80977f5932..e4bbf4c9ed24 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/forms/source/richtext/rtattributehandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_COMPONENT_RTATTRIBUTEHANDLER_HXX
-#define FORMS_SOURCE_COMPONENT_RTATTRIBUTEHANDLER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTEHANDLER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTEHANDLER_HXX
 
 #include "rtattributes.hxx"
 #include <rtl/ref.hxx>
@@ -231,6 +231,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_RTATTRIBUTEHANDLER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTEHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx
index 825ed17c3fa1..d0c96af82ad3 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX
-#define FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX
 
 #include <tools/solar.h>
 #include <sal/types.h>
@@ -157,6 +157,6 @@ namespace frm
 
 } // namespace frm
 
-#endif // FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_RTATTRIBUTES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx
index 6a27b537176d..ee7ab25a9fa6 100644
--- a/forms/source/richtext/specialdispatchers.hxx
+++ b/forms/source/richtext/specialdispatchers.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX
-#define FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX
 
 #include "parametrizedattributedispatcher.hxx"
 
@@ -102,6 +102,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_SPECIALDISPATCHERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/textattributelistener.hxx b/forms/source/richtext/textattributelistener.hxx
index caff79813331..f99932993dcf 100644
--- a/forms/source/richtext/textattributelistener.hxx
+++ b/forms/source/richtext/textattributelistener.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 FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX
-#define FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX
+#define INCLUDED_FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX
 
 #include "rtattributes.hxx"
 
@@ -55,6 +55,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX
+#endif // INCLUDED_FORMS_SOURCE_RICHTEXT_TEXTATTRIBUTELISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index e4fa50a3c043..f17646d43e5e 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_FORMOPERATIONS_HXX
-#define FORMS_FORMOPERATIONS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_RUNTIME_FORMOPERATIONS_HXX
+#define INCLUDED_FORMS_SOURCE_RUNTIME_FORMOPERATIONS_HXX
 
 #include <com/sun/star/form/runtime/XFormOperations.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -380,6 +380,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_FORMOPERATIONS_HXX
+#endif // INCLUDED_FORMS_SOURCE_RUNTIME_FORMOPERATIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 4c3f1ec17fc5..6576902bf774 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_NAVBARCONTROL_HXX
-#define FORMS_NAVBARCONTROL_HXX
+#ifndef INCLUDED_FORMS_SOURCE_SOLAR_COMPONENT_NAVBARCONTROL_HXX
+#define INCLUDED_FORMS_SOURCE_SOLAR_COMPONENT_NAVBARCONTROL_HXX
 
 #include "formnavigation.hxx"
 
@@ -146,6 +146,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_NAVBARCONTROL_HXX
+#endif // INCLUDED_FORMS_SOURCE_SOLAR_COMPONENT_NAVBARCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index e9f91f05e977..e9179c65b981 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOLAR_CONTROL_NAVTOOLBAR_HXX
-#define FORMS_SOLAR_CONTROL_NAVTOOLBAR_HXX
+#ifndef INCLUDED_FORMS_SOURCE_SOLAR_INC_NAVTOOLBAR_HXX
+#define INCLUDED_FORMS_SOURCE_SOLAR_INC_NAVTOOLBAR_HXX
 
 #include <vcl/toolbox.hxx>
 #include <vcl/field.hxx>
@@ -183,6 +183,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_SOLAR_CONTROL_NAVTOOLBAR_HXX
+#endif // INCLUDED_FORMS_SOURCE_SOLAR_INC_NAVTOOLBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index bd683100b086..fd93acb12010 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _NAMECONTAINER_HXX
-#define _NAMECONTAINER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_NAMECONTAINER_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_NAMECONTAINER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <map>
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 80cb5c714763..1e31fa0ea09f 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BINDING_HXX
-#define _BINDING_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_BINDING_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_BINDING_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx
index ab03dfac4639..cd5daa071cb9 100644
--- a/forms/source/xforms/boolexpression.hxx
+++ b/forms/source/xforms/boolexpression.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BOOLEXPRESSION_HXX
-#define _BOOLEXPRESSION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_BOOLEXPRESSION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_BOOLEXPRESSION_HXX
 
 #include "computedexpression.hxx"
 
diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx
index 98ca32ff5364..52425ab797b5 100644
--- a/forms/source/xforms/collection.hxx
+++ b/forms/source/xforms/collection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COLLECTION_HXX
-#define _COLLECTION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_COLLECTION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_COLLECTION_HXX
 
 #include "enumeration.hxx"
 
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 876ef3c25fb5..e6f8ba200cfd 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPUTEDEXPRESSION_HXX
-#define _COMPUTEDEXPRESSION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_COMPUTEDEXPRESSION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_COMPUTEDEXPRESSION_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx
index 3e19e3c61a78..7784fc6d8458 100644
--- a/forms/source/xforms/convert.hxx
+++ b/forms/source/xforms/convert.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONVERT_HXX
-#define _CONVERT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_CONVERT_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_CONVERT_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <map>
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index dd144539ce6a..71466717bdfb 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OFFAPI_COM_SUN_STAR_XFORMS_DATATYPEREPOSITORY_HXX
-#define OFFAPI_COM_SUN_STAR_XFORMS_DATATYPEREPOSITORY_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_DATATYPEREPOSITORY_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_DATATYPEREPOSITORY_HXX
 
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -84,6 +84,6 @@ namespace xforms
 } // namespace xforms
 //........................................................................
 
-#endif // OFFAPI_COM_SUN_STAR_XFORMS_DATATYPEREPOSITORY_HXX
+#endif // INCLUDED_FORMS_SOURCE_XFORMS_DATATYPEREPOSITORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 910a64fbf2ff..5c30b3777bb3 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_XFORMS_DATATYPES_HXX
-#define FORMS_SOURCE_XFORMS_DATATYPES_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_DATATYPES_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_DATATYPES_HXX
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -410,6 +410,6 @@ namespace xforms
 } // namespace xforms
 //........................................................................
 
-#endif // FORMS_SOURCE_XFORMS_DATATYPES_HXX
+#endif // INCLUDED_FORMS_SOURCE_XFORMS_DATATYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx
index 9d10b8ce2319..e77c795dbf2e 100644
--- a/forms/source/xforms/enumeration.hxx
+++ b/forms/source/xforms/enumeration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENUMERATION_HXX
-#define _ENUMERATION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_ENUMERATION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_ENUMERATION_HXX
 
 
 #include <cppuhelper/implbase1.hxx>
diff --git a/forms/source/xforms/evaluationcontext.hxx b/forms/source/xforms/evaluationcontext.hxx
index b248f9037f1b..16dc0b1b9fd2 100644
--- a/forms/source/xforms/evaluationcontext.hxx
+++ b/forms/source/xforms/evaluationcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EVALUATIONCONTEXT_HXX
-#define _EVALUATIONCONTEXT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_EVALUATIONCONTEXT_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_EVALUATIONCONTEXT_HXX
 
 #include <com/sun/star/xml/dom/XNode.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx
index f46a7318ae11..d9974dab5327 100644
--- a/forms/source/xforms/mip.hxx
+++ b/forms/source/xforms/mip.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MIP_HXX
-#define _MIP_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_MIP_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_MIP_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index f68522c48c85..f16beb642ab2 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MODEL_HXX
-#define _MODEL_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HXX
 
 #include <cppuhelper/implbase4.hxx>
 #include <propertysetbase.hxx>
diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx
index 582cb054a43f..28972e34aeda 100644
--- a/forms/source/xforms/model_helper.hxx
+++ b/forms/source/xforms/model_helper.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 _MODEL_HELPER_HXX
-#define _MODEL_HELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HELPER_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HELPER_HXX
 
 //
 // some helper definitions that must be available for model.cxx and
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index 0505a50f1094..c32c888e9dae 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _NAMEDCOLLECTION_HXX
-#define _NAMEDCOLLECTION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_NAMEDCOLLECTION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_NAMEDCOLLECTION_HXX
 
 #include <collection.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx
index 93d187b20e44..9e0a41b74262 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PATHEXPRESSION_HXX
-#define _PATHEXPRESSION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_PATHEXPRESSION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_PATHEXPRESSION_HXX
 
 #include "computedexpression.hxx"
 
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index bdbd5ab1406b..37067cf43c30 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.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 _PROPERTYSETBASE_HXX
-#define _PROPERTYSETBASE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_PROPERTYSETBASE_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_PROPERTYSETBASE_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx
index bc54cf800072..ef166dae3ad7 100644
--- a/forms/source/xforms/resourcehelper.hxx
+++ b/forms/source/xforms/resourcehelper.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 _RESOURCEHELPER_HXX
-#define _RESOURCEHELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_RESOURCEHELPER_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_RESOURCEHELPER_HXX
 
 // include resource IDs
 #include <frm_resource.hrc>
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index 32485299a2f3..97c368554121 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SUBMISSION_HXX
-#define _SUBMISSION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <propertysetbase.hxx>
diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx
index 6a85797e8522..e55968f471f9 100644
--- a/forms/source/xforms/submission/serialization.hxx
+++ b/forms/source/xforms/submission/serialization.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SERIALIZATION_HXX
-#define __SERIALIZATION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_HXX
 
 #include <map>
 
diff --git a/forms/source/xforms/submission/serialization_app_xml.hxx b/forms/source/xforms/submission/serialization_app_xml.hxx
index c7c173ac4692..2f5f5dbbf7b6 100644
--- a/forms/source/xforms/submission/serialization_app_xml.hxx
+++ b/forms/source/xforms/submission/serialization_app_xml.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SERIALIZATION_APP_XML_HXX
-#define __SERIALIZATION_APP_XML_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_APP_XML_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_APP_XML_HXX
 
 #include <com/sun/star/io/XPipe.hpp>
 
diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx
index a778d5177082..8f993c99f677 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.hxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SERIALIZATION_URLENCODED_HXX
-#define __SERIALIZATION_URLENCODED_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_URLENCODED_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_URLENCODED_HXX
 
 #include <com/sun/star/io/XPipe.hpp>
 
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index ac714afb9730..e70df209c90c 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SUBMISSION_HXX
-#define __SUBMISSION_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_HXX
 
 #include <tools/urlobj.hxx>
 #include <rtl/ustring.h>
diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx
index 2acd28440b29..f75c6c43f28e 100644
--- a/forms/source/xforms/submission/submission_get.hxx
+++ b/forms/source/xforms/submission/submission_get.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SUBMISSION_GET_HXX
-#define __SUBMISSION_GET_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_GET_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_GET_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/forms/source/xforms/submission/submission_post.hxx b/forms/source/xforms/submission/submission_post.hxx
index b9ce66ae87a8..7ae31cf5a062 100644
--- a/forms/source/xforms/submission/submission_post.hxx
+++ b/forms/source/xforms/submission/submission_post.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SUBMISSION_POST_HXX
-#define __SUBMISSION_POST_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_POST_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_POST_HXX
 
 #include "submission.hxx"
 
diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx
index d17ad970916d..38c51bc93718 100644
--- a/forms/source/xforms/submission/submission_put.hxx
+++ b/forms/source/xforms/submission/submission_put.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SUBMISSION_PUT_HXX
-#define __SUBMISSION_PUT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_PUT_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_PUT_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx
index 8a83b52e6b22..b2675dca308c 100644
--- a/forms/source/xforms/unohelper.hxx
+++ b/forms/source/xforms/unohelper.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 _UNOHELPER_HXX
-#define _UNOHELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_UNOHELPER_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_UNOHELPER_HXX
 
 #include <sal/types.h>
 
diff --git a/forms/source/xforms/warnings_guard_unicode_regex.h b/forms/source/xforms/warnings_guard_unicode_regex.h
index e032acf25496..5bb83b987ff2 100644
--- a/forms/source/xforms/warnings_guard_unicode_regex.h
+++ b/forms/source/xforms/warnings_guard_unicode_regex.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_WARNINGS_GUARD_UNICODE_REGEX_H
-#define INCLUDED_WARNINGS_GUARD_UNICODE_REGEX_H
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_WARNINGS_GUARD_UNICODE_REGEX_H
+#define INCLUDED_FORMS_SOURCE_XFORMS_WARNINGS_GUARD_UNICODE_REGEX_H
 
 // Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
 // units and more important affects the rest of the current include file, the
@@ -37,6 +37,6 @@
 #pragma warning(pop)
 #endif
 
-#endif // INCLUDED_WARNINGS_GUARD_UNICODE_REGEX_H
+#endif // INCLUDED_FORMS_SOURCE_XFORMS_WARNINGS_GUARD_UNICODE_REGEX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index 8f1649d908df..c468b895bd0a 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.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 __XFORMSEVENT_HXX
-#define __XFORMSEVENT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_XFORMSEVENT_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_XFORMSEVENT_HXX
 
 #include <sal/types.h>
 #include <cppuhelper/implbase1.hxx>
diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx
index d55432d6ffc2..b3d853303d0b 100644
--- a/forms/source/xforms/xmlhelper.hxx
+++ b/forms/source/xforms/xmlhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLHELPER_HXX
-#define _XMLHELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_XFORMS_XMLHELPER_HXX
+#define INCLUDED_FORMS_SOURCE_XFORMS_XMLHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-- 
cgit