loplugin:includeform: forms

Change-Id: I770fe656a390045e850e967074545bf5dac7f335

79 files changed, 170 insertions, 170 deletions

diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index eabc05286e13..cd3907742686 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
 
 #include "clickableimage.hxx"
-#include "togglestate.hxx"
-#include "formnavigation.hxx"
-#include "resettable.hxx"
+#include <togglestate.hxx>
+#include <formnavigation.hxx>
+#include <resettable.hxx>
 
 #include <com/sun/star/awt/MouseEvent.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index a258b315c6b6..94c206033028 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "CheckBox.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 18647097b426..32d5c4db1e94 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -20,8 +20,8 @@
 #include <string.h>
 
 #include "Columns.hxx"
-#include "property.hxx"
-#include "componenttools.hxx"
+#include <property.hxx>
+#include <componenttools.hxx>
 #include "findpos.hxx"
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
@@ -36,8 +36,8 @@
 #include <comphelper/property.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/servicehelper.hxx>
-#include "services.hxx"
-#include "strings.hrc"
+#include <services.hxx>
+#include <strings.hrc>
 #include <tools/debug.hxx>
 
 
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 0ea0b1bbc49f..26b6aec61cbd 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 
-#include "cloneable.hxx"
-#include "frm_strings.hxx"
+#include <cloneable.hxx>
+#include <frm_strings.hxx>
 
 #include <com/sun/star/io/XObjectInputStream.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 121bcc7e18eb..4db71e5b604d 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -19,11 +19,11 @@
 
 
 #include "ComboBox.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 
-#include "frm_resource.hxx"
-#include "strings.hrc"
+#include <frm_resource.hxx>
+#include <strings.hrc>
 #include "BaseListBox.hxx"
 
 #include <com/sun/star/sdb/SQLErrorEvent.hpp>
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 0693ee2cdb97..ba840bc592c2 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
 
 #include <memory>
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include "errorbroadcaster.hxx"
 #include "entrylisthelper.hxx"
 #include "cachedrowset.hxx"
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index c658edc98ada..793940f17229 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "Currency.hxx"
-#include "services.hxx"
+#include <services.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 73bbd8a8afcc..9112c9e3ad40 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -18,14 +18,14 @@
  */
 
 
-#include "componenttools.hxx"
+#include <componenttools.hxx>
 #include "DatabaseForm.hxx"
 #include "EventThread.hxx"
-#include "strings.hrc"
-#include "frm_resource.hxx"
+#include <strings.hrc>
+#include <frm_resource.hxx>
 #include "GroupManager.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 38547cc0327f..7e0ac15b3ab3 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-#include "propertybaghelper.hxx"
+#include <propertybaghelper.hxx>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/XSQLErrorListener.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -59,13 +59,13 @@
 
 
 #include <tools/link.hxx>
-#include "InterfaceContainer.hxx"
+#include <InterfaceContainer.hxx>
 
 #include <connectivity/parameters.hxx>
 #include <connectivity/filtermanager.hxx>
 #include <connectivity/warningscontainer.hxx>
 
-#include "listenercontainers.hxx"
+#include <listenercontainers.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 5ef5a02284b4..117533ed7b5a 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "Date.hxx"
-#include "services.hxx"
+#include <services.hxx>
 #include <tools/date.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 59a4a94b8543..1074ff25a732 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
 
 #include "EditBase.hxx"
-#include "limitedformats.hxx"
+#include <limitedformats.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index a04ae4fb4044..86d90a288e5f 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -18,13 +18,13 @@
  */
 
 #include "EditBase.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include "frm_resource.hxx"
-#include "strings.hrc"
+#include <frm_resource.hxx>
+#include <strings.hrc>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <com/sun/star/util/Time.hpp>
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 172574393c59..3790e4f5d6b7 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XKeyListener.hpp>
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 0a8b501df219..7b796897cde5 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/form/FormComponentType.hpp>
 
-#include "services.hxx"
+#include <services.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/container.hxx>
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index e0ba9d2f3381..a20eb945d2ab 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 2e8f6df84ea3..537ee2b5a60a 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -18,11 +18,11 @@
  */
 
 #include "Filter.hxx"
-#include "FormComponent.hxx"
-#include "strings.hrc"
-#include "frm_resource.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <FormComponent.hxx>
+#include <strings.hrc>
+#include <frm_resource.hxx>
+#include <property.hxx>
+#include <services.hxx>
 
 #include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 990eaded5068..a734433d559b 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "FixedText.hxx"
-#include "services.hxx"
-#include "property.hxx"
+#include <services.hxx>
+#include <property.hxx>
 #include <comphelper/processfactory.hxx>
 
 
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index eba1f531e9ca..262aafb66768 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 51a54bac573d..9de32950f657 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -16,11 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "componenttools.hxx"
-#include "FormComponent.hxx"
-#include "strings.hrc"
-#include "frm_resource.hxx"
-#include "services.hxx"
+#include <componenttools.hxx>
+#include <FormComponent.hxx>
+#include <strings.hrc>
+#include <frm_resource.hxx>
+#include <services.hxx>
 
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 27cdd02b1e6c..ff3ca9b054f2 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "FormattedField.hxx"
-#include "services.hxx"
-#include "property.hxx"
-#include "frm_resource.hxx"
-#include "strings.hrc"
-#include "propertybaghelper.hxx"
+#include <services.hxx>
+#include <property.hxx>
+#include <frm_resource.hxx>
+#include <strings.hrc>
+#include <propertybaghelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/numbers.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 60adbca0e735..88b33c0d0e37 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -21,7 +21,7 @@
 #include "Edit.hxx"
 #include "FormattedField.hxx"
 #include "EditBase.hxx"
-#include "services.hxx"
+#include <services.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index d44ea9eee471..a66ddc997e16 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 2d427c01ef8c..a9e49f9f8ca0 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "FormsCollection.hxx"
-#include "services.hxx"
+#include <services.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index 5493a6c2f5a1..0e06c27a17da 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMSCOLLECTION_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_FORMSCOLLECTION_HXX
 
-#include "InterfaceContainer.hxx"
+#include <InterfaceContainer.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index dd7ff7c303d9..522c0de7c94a 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -22,8 +22,8 @@
 #include "Columns.hxx"
 #include "findpos.hxx"
 #include "Grid.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 716aab920ab2..a844b87a9dd2 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_GRID_HXX
 
 #include "errorbroadcaster.hxx"
-#include "FormComponent.hxx"
-#include "formcontrolfont.hxx"
-#include "InterfaceContainer.hxx"
+#include <FormComponent.hxx>
+#include <formcontrolfont.hxx>
+#include <InterfaceContainer.hxx>
 
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 5f1a34bc541c..46d79c00a793 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "GroupBox.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index 2c76cfe6b20b..2e2233798e90 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 486ad435aec5..94620bbb1313 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -24,7 +24,7 @@
 #include <osl/diagnose.h>
 #include <tools/solar.h>
 
-#include "frm_strings.hxx"
+#include <frm_strings.hxx>
 
 #include <algorithm>
 
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index a41a25d56bdc..d8507313a9e2 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "Hidden.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 827355eed8ec..d3b4d7d51eb1 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index d402a7a87c95..277631c96a2c 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -19,10 +19,10 @@
 
 #include "ImageControl.hxx"
 
-#include "strings.hrc"
-#include "frm_resource.hxx"
-#include "services.hxx"
-#include "componenttools.hxx"
+#include <strings.hrc>
+#include <frm_resource.hxx>
+#include <services.hxx>
+#include <componenttools.hxx>
 
 #include <svtools/imageresourceaccess.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index e3d70288e81f..07689b802b26 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include "imgprod.hxx"
 #include <com/sun/star/form/XImageProducerSupplier.hpp>
 #include <com/sun/star/awt/XMouseListener.hpp>
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index b8bd02146cd5..23b3d961a26a 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -20,13 +20,13 @@
 #include <config_features.h>
 
 #include "ListBox.hxx"
-#include "property.hxx"
-#include "services.hxx"
-#include "frm_resource.hxx"
-#include "strings.hrc"
+#include <property.hxx>
+#include <services.hxx>
+#include <frm_resource.hxx>
+#include <strings.hrc>
 #include "BaseListBox.hxx"
-#include "listenercontainers.hxx"
-#include "componenttools.hxx"
+#include <listenercontainers.hxx>
+#include <componenttools.hxx>
 
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index ed64334f3641..2a0f76e669d1 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include "cachedrowset.hxx"
 #include "errorbroadcaster.hxx"
 #include "entrylisthelper.hxx"
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index bd0918061326..1f92f6218c68 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "Pattern.hxx"
-#include "comphelper/processfactory.hxx"
+#include <comphelper/processfactory.hxx>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 63f282bd5633..8946a49d4554 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -19,8 +19,8 @@
 
 #include "RadioButton.hxx"
 #include "GroupManager.hxx"
-#include "property.hxx"
-#include "services.hxx"
+#include <property.hxx>
+#include <services.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 2c980e80f702..81c5b47c04be 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
 
 #include "EditBase.hxx"
-#include "limitedformats.hxx"
+#include <limitedformats.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx
index a17e29ceff64..3e88707e7b52 100644
--- a/forms/source/component/cachedrowset.cxx
+++ b/forms/source/component/cachedrowset.cxx
@@ -19,8 +19,8 @@
 
 
 #include "cachedrowset.hxx"
-#include "services.hxx"
-#include "frm_strings.hxx"
+#include <services.hxx>
+#include <frm_strings.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index fb8d5b783808..fa3e46ae47bf 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "clickableimage.hxx"
-#include "controlfeatureinterception.hxx"
-#include "urltransformer.hxx"
-#include "componenttools.hxx"
+#include <controlfeatureinterception.hxx>
+#include <urltransformer.hxx>
+#include <componenttools.hxx>
 #include <com/sun/star/form/XSubmit.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
@@ -40,7 +40,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <osl/mutex.hxx>
-#include "services.hxx"
+#include <services.hxx>
 #include <comphelper/container.hxx>
 #include <comphelper/listenernotification.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 665f2d6ecbeb..1aefca1563e7 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
 
 #include <memory>
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include "EventThread.hxx"
 #include "imgprod.hxx"
 #include <tools/link.hxx>
diff --git a/forms/source/component/cloneable.cxx b/forms/source/component/cloneable.cxx
index 1b32b77dd05e..9770019c238d 100644
--- a/forms/source/component/cloneable.cxx
+++ b/forms/source/component/cloneable.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "cloneable.hxx"
+#include <cloneable.hxx>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <comphelper/uno3.hxx>
 #include <tools/debug.hxx>
diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx
index 1e75a98846b1..1ee33f7ef252 100644
--- a/forms/source/component/entrylisthelper.cxx
+++ b/forms/source/component/entrylisthelper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "entrylisthelper.hxx"
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx
index 90f164dc7af3..62a8f26b6b9b 100644
--- a/forms/source/component/findpos.cxx
+++ b/forms/source/component/findpos.cxx
@@ -18,14 +18,14 @@
  */
 
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include "findpos.hxx"
 
-#include "com/sun/star/uno/Sequence.hxx"
-#include "comphelper/types.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
+#include <com/sun/star/uno/Sequence.hxx>
+#include <comphelper/types.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 #include <algorithm>
 
diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx
index 792f435d5bbc..3c108ba1d425 100644
--- a/forms/source/component/findpos.hxx
+++ b/forms/source/component/findpos.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FINDPOS_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_FINDPOS_HXX
 
-#include "sal/config.h"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "sal/types.h"
+#include <sal/config.h>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <sal/types.h>
 
 
 namespace detail {
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 94a2eee15f41..3742c7a1a959 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "formcontrolfont.hxx"
-#include "frm_strings.hxx"
-#include "property.hxx"
+#include <formcontrolfont.hxx>
+#include <frm_strings.hxx>
+#include <property.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index b40f964a056f..7424b92aacfe 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "imgprod.hxx"
-#include "services.hxx"
+#include <services.hxx>
 
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/cvtgrf.hxx>
@@ -29,7 +29,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include "svtools/imageresourceaccess.hxx"
+#include <svtools/imageresourceaccess.hxx>
 #include <comphelper/processfactory.hxx>
 
 
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 29f9993e8e7d..6cc028c6b8e5 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainerhelper.hxx>
@@ -28,7 +28,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include "formcontrolfont.hxx"
+#include <formcontrolfont.hxx>
 
 #include <set>
 
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 5f14626bd081..8adde794b8b4 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "propertybaghelper.hxx"
+#include <propertybaghelper.hxx>
 
-#include "property.hxx"
+#include <property.hxx>
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/beans/PropertyExistException.hpp>
@@ -30,7 +30,7 @@
 #include <tools/diagnose_ex.h>
 
 #include <comphelper/sequence.hxx>
-#include "rtl/instance.hxx"
+#include <rtl/instance.hxx>
 
 
 #define NEW_HANDLE_BASE 10000
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index b6b9805a56ea..804c477586ca 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
 
-#include "FormComponent.hxx"
-#include "togglestate.hxx"
+#include <FormComponent.hxx>
+#include <togglestate.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index 9d23b6351143..e79338e373a4 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 namespace frm
 {
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 0a60ea52979f..9f79ce1d94a1 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
 
-#include "FormComponent.hxx"
+#include <FormComponent.hxx>
 
 
 namespace frm
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index e35ac39fecc5..9a19d9a6fe28 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "commandimageprovider.hxx"
+#include <commandimageprovider.hxx>
 
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 4bb4ef189a1a..f3299dea6499 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "controlfeatureinterception.hxx"
-#include "urltransformer.hxx"
+#include <controlfeatureinterception.hxx>
+#include <urltransformer.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index f79185b60d05..529ba5f1f81a 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "formnavigation.hxx"
-#include "urltransformer.hxx"
-#include "controlfeatureinterception.hxx"
-#include "frm_strings.hxx"
+#include <formnavigation.hxx>
+#include <urltransformer.hxx>
+#include <controlfeatureinterception.hxx>
+#include <frm_strings.hxx>
 
 #include <com/sun/star/form/runtime/FormFeature.hpp>
 
diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx
index 415cbf68859d..6eac1633d82d 100644
--- a/forms/source/helper/resettable.cxx
+++ b/forms/source/helper/resettable.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "resettable.hxx"
+#include <resettable.hxx>
 
 #include <cppuhelper/weak.hxx>
 
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index 58f4db8703f1..218ba86ab9af 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "urltransformer.hxx"
+#include <urltransformer.hxx>
 
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <tools/debug.hxx>
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index 952476709206..148c8090b0b1 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "windowstateguard.hxx"
-#include "frm_strings.hxx"
+#include <windowstateguard.hxx>
+#include <frm_strings.hxx>
 
 #include <com/sun/star/awt/XWindowListener2.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index ff5da9db29b5..6c4885260afb 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "strings.hrc"
-#include "frm_resource.hxx"
-#include "InterfaceContainer.hxx"
-#include "componenttools.hxx"
-#include "services.hxx"
+#include <strings.hrc>
+#include <frm_resource.hxx>
+#include <InterfaceContainer.hxx>
+#include <componenttools.hxx>
+#include <services.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index d57e67adeb78..41a0621881b3 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "componenttools.hxx"
+#include <componenttools.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
 #include <comphelper/sequence.hxx>
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 1a416c7c3f64..6ab1b6378b7e 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "limitedformats.hxx"
-#include "services.hxx"
+#include <limitedformats.hxx>
+#include <services.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>
diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx
index e7fc68deafc5..78c07626a95a 100644
--- a/forms/source/misc/listenercontainers.cxx
+++ b/forms/source/misc/listenercontainers.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "listenercontainers.hxx"
+#include <listenercontainers.hxx>
 
 
 namespace frm
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index c57d43dc2de3..11c3ad7d2022 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "frm_strings.hxx"
-#include "property.hxx"
+#include <frm_strings.hxx>
+#include <property.hxx>
 
 namespace frm
 {
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index aacea75a5811..21b440e55d2c 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "frm_resource.hxx"
+#include <frm_resource.hxx>
 #include <unotools/resmgr.hxx>
 
 namespace frm
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index ab662fa1d078..2bef6b43fb43 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "richtextcontrol.hxx"
-#include "services.hxx"
+#include <services.hxx>
 
 #include "richtextmodel.hxx"
 #include "richtextvclcontrol.hxx"
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index f8a141642f66..07406bfb295b 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
 #define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTMODEL_HXX
 
-#include "FormComponent.hxx"
-#include "formcontrolfont.hxx"
+#include <FormComponent.hxx>
+#include <formcontrolfont.hxx>
 #include "richtextunowrapper.hxx"
 #include <comphelper/propertycontainerhelper.hxx>
 #include <comphelper/listenernotification.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 61827518793b..bfa4be78ca9a 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -27,7 +27,7 @@
     #include <vcl/msgbox.hxx>
     #include <sfx2/filedlghelper.hxx>
     #include <tools/urlobj.hxx>
-    #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+    #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #endif
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/editeng.hxx>
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 4952c7be2b07..4ae5e1c691d1 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -20,10 +20,10 @@
 #include <config_features.h>
 
 #include "formoperations.hxx"
-#include "frm_strings.hxx"
-#include "frm_resource.hxx"
-#include "strings.hrc"
-#include "services.hxx"
+#include <frm_strings.hxx>
+#include <frm_resource.hxx>
+#include <strings.hrc>
+#include <services.hxx>
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 01b798808720..545cb444d821 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -19,11 +19,11 @@
 
 
 #include "navbarcontrol.hxx"
-#include "frm_strings.hxx"
-#include "FormComponent.hxx"
-#include "componenttools.hxx"
-#include "navtoolbar.hxx"
-#include "commandimageprovider.hxx"
+#include <frm_strings.hxx>
+#include <FormComponent.hxx>
+#include <componenttools.hxx>
+#include <navtoolbar.hxx>
+#include <commandimageprovider.hxx>
 
 #include <com/sun/star/awt/XView.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 4f2463e652e5..052cceedc8d7 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_SOLAR_COMPONENT_NAVBARCONTROL_HXX
 #define INCLUDED_FORMS_SOURCE_SOLAR_COMPONENT_NAVBARCONTROL_HXX
 
-#include "formnavigation.hxx"
+#include <formnavigation.hxx>
 
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 14ea335570d4..50a84443d3da 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "navtoolbar.hxx"
-#include "frm_resource.hxx"
-#include "featuredispatcher.hxx"
-#include "strings.hrc"
-#include "commandimageprovider.hxx"
+#include <navtoolbar.hxx>
+#include <frm_resource.hxx>
+#include <featuredispatcher.hxx>
+#include <strings.hrc>
+#include <commandimageprovider.hxx>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/form/runtime/FormFeature.hpp>
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index b5d042a4d25f..dc6ba779bbc4 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <propertysetbase.hxx>
+#include "propertysetbase.hxx"
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/form/binding/XListEntrySource.hpp>
 #include <com/sun/star/form/validation/XValidator.hpp>
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index c6a860b3db87..79d4a37f35d4 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -20,10 +20,10 @@
 
 #include "datatyperepository.hxx"
 #include "datatypes.hxx"
-#include "strings.hrc"
-#include "frm_resource.hxx"
-#include "frm_strings.hxx"
-#include "property.hxx"
+#include <strings.hrc>
+#include <frm_resource.hxx>
+#include <frm_strings.hxx>
+#include <property.hxx>
 
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/util/VetoException.hpp>
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 82473435c102..da3460edb5ea 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -20,8 +20,8 @@
 #include <memory>
 #include "datatypes.hxx"
 #include "resourcehelper.hxx"
-#include "frm_strings.hxx"
-#include "property.hxx"
+#include <frm_strings.hxx>
+#include <property.hxx>
 #include "convert.hxx"
 
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 7f5fab55900d..d64f28e01853 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <propertysetbase.hxx>
+#include "propertysetbase.hxx"
 #include <com/sun/star/xforms/XModel2.hpp>
 #include <com/sun/star/xforms/XFormsUIHelper1.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index 7546ba271035..a9931eb97c3d 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_XFORMS_NAMEDCOLLECTION_HXX
 #define INCLUDED_FORMS_SOURCE_XFORMS_NAMEDCOLLECTION_HXX
 
-#include <collection.hxx>
+#include "collection.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 
diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx
index 49ecdb5b6140..0e3cbdf00b66 100644
--- a/forms/source/xforms/resourcehelper.cxx
+++ b/forms/source/xforms/resourcehelper.cxx
@@ -19,7 +19,7 @@
 
 
 #include "resourcehelper.hxx"
-#include "frm_resource.hxx"
+#include <frm_resource.hxx>
 
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index 836e3a098c07..fc095d7c3965 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <propertysetbase.hxx>
+#include "propertysetbase.hxx"
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/xml/dom/events/XEventListener.hpp>
@@ -34,7 +34,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <computedexpression.hxx>
+#include "computedexpression.hxx"
 
 // forward declaractions
 namespace com { namespace sun { namespace star {
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index e171ac422328..fd97a359d3c6 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include "extension.hxx"
 #include "xpathlib.hxx"
-#include "services.hxx"
+#include <services.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;