Remove UNO includes comments

Change-Id: I48e193322967fb75e93eaf81e9e2110d3056f92a

89 files changed, 0 insertions, 191 deletions

diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index c7a3dd0141ea..84f1cb7e83d1 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -31,7 +31,6 @@
 #include "methodguard.hxx"
 #include "loghandler.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XConsoleHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/logging/LogLevel.hpp>
@@ -39,7 +38,6 @@
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index d73d2d8c68d7..26dfc9de8636 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -23,12 +23,10 @@
 #include <stdio.h>
 #include <string>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XCsvLogFormatter.hpp>
 #include <com/sun/star/logging/XLogFormatter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/componentcontext.hxx>
 
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 0d5d9d9965f3..be841ffe5c0c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -31,7 +31,6 @@
 #include "methodguard.hxx"
 #include "loghandler.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XLogHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
@@ -39,7 +38,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/util/PathSubstitution.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index 46dd19c0b85e..e5af7a66f236 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -26,9 +26,6 @@
  *
  ************************************************************************/
 
-
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
 #include "log_module.hxx"
 
 //........................................................................
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index d637a1c9b075..e692919c78a2 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -22,13 +22,11 @@
 #include "logrecord.hxx"
 #include "loggerconfig.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XLogger.hpp>
 #include <com/sun/star/logging/LogLevel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/logging/XLoggerPool.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 72438786a6bb..86a1f007f0c9 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -29,7 +29,6 @@
 
 #include "loggerconfig.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -41,7 +40,6 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/logging/XLogHandler.hpp>
 #include <com/sun/star/logging/XLogFormatter.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx
index c5172e47a2bb..3697ac3dbbdd 100644
--- a/extensions/source/logging/loggerconfig.hxx
+++ b/extensions/source/logging/loggerconfig.hxx
@@ -20,9 +20,7 @@
 #ifndef EXTENSIONS_LOGGERCONFIG_HXX
 #define EXTENSIONS_LOGGERCONFIG_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XLogger.hpp>
-/** === end UNO includes === **/
 
 namespace comphelper
 {
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index 42107c364a45..dcba3ba995b2 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -20,12 +20,10 @@
 
 #include "loghandler.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/LogLevel.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/logging/PlainTextFormatter.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 #include <comphelper/componentcontext.hxx>
diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx
index 194435c8b1af..2852c9fe53f2 100644
--- a/extensions/source/logging/loghandler.hxx
+++ b/extensions/source/logging/loghandler.hxx
@@ -29,11 +29,9 @@
 #ifndef LOGHANDLER_HXX
 #define LOGHANDLER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XLogFormatter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/logging/LogRecord.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/namedvaluecollection.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx
index 191d4efdaecf..96e19f786197 100644
--- a/extensions/source/logging/logrecord.cxx
+++ b/extensions/source/logging/logrecord.cxx
@@ -19,9 +19,6 @@
 
 #include "logrecord.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <osl/time.h>
 #include <osl/thread.h>
 #include <osl/diagnose.h>
diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx
index d846d8dda522..85962d19a594 100644
--- a/extensions/source/logging/logrecord.hxx
+++ b/extensions/source/logging/logrecord.hxx
@@ -20,9 +20,7 @@
 #ifndef LOGRECORD_HXX
 #define LOGRECORD_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/LogRecord.hpp>
-/** === end UNO includes === **/
 
 #include <osl/interlck.h>
 
diff --git a/extensions/source/logging/methodguard.hxx b/extensions/source/logging/methodguard.hxx
index b84d95ae37fe..aa5a9474bfbe 100644
--- a/extensions/source/logging/methodguard.hxx
+++ b/extensions/source/logging/methodguard.hxx
@@ -20,9 +20,6 @@
 #ifndef EXTENSIONS_METHODGUARD_HXX
 #define EXTENSIONS_METHODGUARD_HXX
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace logging
 {
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 83b64c3a1988..fd84d20fece2 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -31,11 +31,9 @@
 
 #include <stdio.h>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/logging/XLogFormatter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/componentcontext.hxx>
 
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index be88c81b3b01..f08d10d0e521 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -29,9 +29,7 @@
 #ifndef _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
 #define _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index ec907ab4caff..5ecccec0738e 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -33,11 +33,9 @@
 #include "linedescriptor.hxx"
 #include "inspectorhelpwindow.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/asyncnotification.hxx>
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index a2f0ea8545b5..7fcdb6c3014e 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -33,10 +33,8 @@
 #include "modulepcr.hxx"
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
-/** === end UNO includes === **/
 #include <vcl/scrbar.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index b2966475ce7c..8a91da2b5b8e 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -31,8 +31,6 @@
 #include "formmetadata.hxx"
 #include "pushbuttonnavigation.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 //------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index 5c89202eb8a1..5cd55f7bfd59 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -22,9 +22,6 @@
 
 #include "propertyhandler.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index d58c8ae5fa3e..a149a7a605f2 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -31,11 +31,9 @@
 #include "formmetadata.hxx"
 #include "cellbindinghelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 //------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index cf086fc758c3..bb771ddf90d1 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -22,9 +22,7 @@
 
 #include "propertyhandler.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
 #include <rtl/ref.hxx>
 
 #include <memory>
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index 58fa295a2b5b..c5257ddf72d1 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -29,7 +29,6 @@
 #ifndef EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
 #define EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -39,7 +38,6 @@
 #include <com/sun/star/form/binding/XListEntrySource.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
-/** === end UNO includes === **/
 
 //............................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index 5be4d409613b..cd2e23280613 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -29,10 +29,8 @@
 #ifndef _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
 #define _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <tools/link.hxx>
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index a3e06f6f4d23..0512dad4bf82 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -28,11 +28,9 @@
 
 #include "composeduiupdate.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/inspection/PropertyLineElement.hpp>
-/** === end UNO includes === **/
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 1a9617cf6948..12e90abc6cf0 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -31,9 +31,7 @@
 
 #include "propertyhandler.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 
 #include <map>
 #include <set>
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 3389d485b172..ceb203d01419 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -34,10 +34,8 @@
 #include "propctrlr.hrc"
 #include "formmetadata.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/implbase1.hxx>
 #include <osl/diagnose.h>
 #include <sal/macros.h>
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 9ceaa157e215..d8b6ebec3d6b 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -30,9 +30,6 @@
 
 #include "inspectormodelbase.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <memory>
 
 //........................................................................
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index bcced921218e..3401fb405267 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -31,11 +31,9 @@
 #include "pcrcommon.hxx"
 #include "modulepcr.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
-/** === end UNO includes === **/
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index d276b885d378..cf0444c58740 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -20,11 +20,9 @@
 #ifndef EXTENSIONS_DEFAULTHELPPROVIDER_HXX
 #define EXTENSIONS_DEFAULTHELPPROVIDER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XPropertyControlObserver.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/implbase2.hxx>
 #include <comphelper/componentcontext.hxx>
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 79c319c65ecd..9da028e8a5d3 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -30,9 +30,7 @@
 #include "formstrings.hxx"
 #include "formmetadata.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 #define TEXTTYPE_SINGLELINE     0
diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx
index 9b8b135575e4..803f1ca6d668 100644
--- a/extensions/source/propctrlr/editpropertyhandler.hxx
+++ b/extensions/source/propctrlr/editpropertyhandler.hxx
@@ -22,9 +22,6 @@
 
 #include "propertyhandler.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index db5155b36d7f..76ebdd27c18a 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -33,13 +33,11 @@
 #include "propeventtranslation.hxx"
 #include "formbrowsertools.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/xforms/XFormsUIHelper1.hpp>
 #include <com/sun/star/xsd/DataTypeClass.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
-/** === end UNO includes === **/
 #include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index 8adda94f1c2f..d4ba742fc817 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -22,14 +22,12 @@
 
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xforms/XModel.hpp>
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/form/binding/XListEntrySource.hpp>
-/** === end UNO includes === **/
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 4b1cbc6ed32e..c3219954acfa 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -34,11 +34,9 @@
 #include "eformshelper.hxx"
 #include "handlerhelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 #include <functional>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 60ac93d9d860..cbad1720c6d9 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -22,9 +22,6 @@
 
 #include "propertyhandler.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <memory>
 
 //........................................................................
diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx
index 226ec231b34c..0834b7888c49 100644
--- a/extensions/source/propctrlr/enumrepresentation.hxx
+++ b/extensions/source/propctrlr/enumrepresentation.hxx
@@ -20,9 +20,7 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/Any.hxx>
-/** === end UNO includes === **/
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index ecc045a0a166..f7a6862598fd 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -38,7 +38,6 @@
 #include "pcrstrings.hxx"
 #include "propertycontrolextender.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
@@ -59,7 +58,6 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/evtmethodhelper.hxx>
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 228d3cf44634..4ce21617071c 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -33,13 +33,11 @@
 #include "pcrcommontypes.hxx"
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/listenernotification.hxx>
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4d13636b63a8..5cd7b37c5ca1 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -43,7 +43,6 @@
 #include "taborder.hxx"
 #include "usercontrol.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -77,7 +76,6 @@
 #include <com/sun/star/resource/MissingResourceException.hpp>
 #include <com/sun/star/graphic/GraphicObject.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/extract.hxx>
 #include <connectivity/dbconversion.hxx>
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index b1bd7f914842..61036725692c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -26,13 +26,11 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
-/** === begin UNO includes === **/
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
-/** === end UNO includes === **/
 #include <tools/fldunit.hxx>
 #include <vcl/waitobj.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 556e6460b03b..8956acb854a5 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -32,12 +32,10 @@
 #include "defaultforminspection.hxx"
 #include "propctrlr.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/typeprovider.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index 8644a2931842..f6e6c7d6b11a 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -21,8 +21,6 @@
 
 #include "propcontroller.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
 #include <cppuhelper/propshlp.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 2fc5f763a5f1..3a9d88d3bd7c 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -32,7 +32,6 @@
 #include "handlerhelper.hxx"
 #include "cellbindinghelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
@@ -46,7 +45,6 @@
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/componentbase.hxx>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 1762069c953e..e8b19fd7e257 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -41,7 +41,6 @@
 #include <connectivity/dbexception.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
@@ -50,7 +49,6 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
-/** === end UNO includes === **/
 
 
 //............................................................................
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 1aa488cdbcae..1ed5330769c8 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -33,12 +33,10 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 
 #include <memory>
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 5389c9b47a8d..6d630decda24 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -30,7 +30,6 @@
 #include "formmetadata.hxx"
 #include "handlerhelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XEnumTypeDescription.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
@@ -40,7 +39,6 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 #include <comphelper/extract.hxx>
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 3b2807704e9a..3ba0cb1fcace 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -25,11 +25,9 @@
 #include "pcrcommon.hxx"
 #include "pcrcomponentcontext.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XIntrospectionAccess.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/compbase2.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <rtl/ref.hxx>
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index c1b47bf96733..d20e9064cf65 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -35,7 +35,6 @@
 #include "formmetadata.hxx"
 #include "pcrcomponentcontext.hxx"
 
-/** === begin UNO includes === **/
 #include "com/sun/star/inspection/StringRepresentation.hpp"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -45,7 +44,6 @@
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/XStringListControl.hpp>
 #include <com/sun/star/inspection/XNumericControl.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/StringListResource.hxx>
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 28eac9b7a24d..3d212affa8d0 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -20,7 +20,6 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
@@ -28,7 +27,6 @@
 #include <com/sun/star/inspection/XPropertyControlFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/Optional.hpp>
-/** === end UNO includes === **/
 
 #include <vector>
 
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 2e77a3e32ef9..bbcf8f06d9c1 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -20,9 +20,6 @@
 #include "modulepcr.hxx"
 #include "propresid.hrc"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx
index 9e09bbd90d68..886240696221 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.hxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx
@@ -19,9 +19,6 @@
 #ifndef INSPECTORHELPWINDOW_HXX
 #define INSPECTORHELPWINDOW_HXX
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
 
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index 002138f8e81c..d346b16f4e81 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -20,9 +20,7 @@
 #include "inspectormodelbase.hxx"
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-/** === end UNO includes === **/
 
 #include <comphelper/propertycontainerhelper.hxx>
 
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 42dfcad3cfaa..a82e64601a94 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -20,11 +20,9 @@
 #ifndef INSPECTORMODELBASE_HXX
 #define INSPECTORMODELBASE_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/propshlp.hxx>
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx
index dfb9670994fb..578897182d73 100644
--- a/extensions/source/propctrlr/linedescriptor.hxx
+++ b/extensions/source/propctrlr/linedescriptor.hxx
@@ -20,9 +20,7 @@
 #define _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_
 
 #include <vcl/image.hxx>
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/LineDescriptor.hpp>
-/** === end UNO includes === **/
 
 //............................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 3b13fac234c4..b46ece0f41e3 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -34,9 +34,6 @@
 #include "formstrings.hxx"
 #include <vcl/msgbox.hxx>
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index 9a473d86945f..67083efed777 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -25,9 +25,7 @@
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 
 //........................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 367a550cffc3..7c88b1b34de7 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -32,9 +32,6 @@
 #include "modulepcr.hxx"
 #include "formresid.hrc"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 //........................................................................
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index 725ebcf52835..57395679da52 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -20,9 +20,6 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 24107f4de114..61f116a90e93 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -21,10 +21,8 @@
 #include "pcrcommon.hxx"
 #include "inspectormodelbase.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/implbase3.hxx>
 
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 196a9dac6dab..e3d718de07f2 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -30,9 +30,7 @@
 #include "modulepcr.hxx"
 #include "propresid.hrc"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/util/MeasureUnit.hpp>
-/** === end UNO includes === **/
 #include <rtl/ustrbuf.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index e99902fbbf9f..6412839fb0a7 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -23,11 +23,9 @@
 #define EDITOR_LIST_APPEND              (sal_uInt16)-1
 #define EDITOR_LIST_REPLACE_EXISTING    (sal_uInt16)-1
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-/** === end UNO includes === **/
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index 7cec06d7e10c..cb7f6f0deac4 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -29,9 +29,7 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/Property.hpp>
-/** === end UNO includes === **/
 #include <rtl/ustring.hxx>
 
 #include <boost/unordered_map.hpp>
diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx
index 319f35cd4d3c..4b972c91d965 100644
--- a/extensions/source/propctrlr/pcrcomponentcontext.cxx
+++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx
@@ -28,11 +28,9 @@
 
 #include "pcrcomponentcontext.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 
 //........................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx
index cf12486be52c..dba5c34415ef 100644
--- a/extensions/source/propctrlr/pcrcomponentcontext.hxx
+++ b/extensions/source/propctrlr/pcrcomponentcontext.hxx
@@ -29,10 +29,8 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PCROMPONENTCONTEXT_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_PCROMPONENTCONTEXT_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
 
 //........................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 36bc66627533..ecc18697fb23 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -39,12 +39,10 @@
 #include "formbrowsertools.hxx"
 #include "propertycomposer.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/types.hxx>
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index a2343ebc2d97..c03ba71da0be 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -39,7 +39,6 @@
 #include "propertyinfo.hxx"
 #include "pcrcomponentcontext.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -61,7 +60,6 @@
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-/** === end UNO includes === **/
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase7.hxx>
diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx
index c42aa438b32f..831ae94a6a28 100644
--- a/extensions/source/propctrlr/propcontrolobserver.hxx
+++ b/extensions/source/propctrlr/propcontrolobserver.hxx
@@ -28,9 +28,7 @@
 #ifndef PROPCONTROLOBSERVER_HXX
 #define PROPCONTROLOBSERVER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
 
 //........................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index d694c0abc352..1d6aea4574c0 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -28,10 +28,8 @@
 
 #include "propertycomposer.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-/** === end UNO includes === **/
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index cbfd8c820912..75e4e1af07e0 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -33,11 +33,9 @@
 #include "composeduiupdate.hxx"
 #include "formbrowsertools.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx
index 0e5bbec51aea..ef9215b6ff0a 100644
--- a/extensions/source/propctrlr/propertycontrolextender.cxx
+++ b/extensions/source/propctrlr/propertycontrolextender.cxx
@@ -20,9 +20,7 @@
 
 #include "propertycontrolextender.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/KeyFunction.hpp>
-/** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx
index e4fa15328547..91cf9e4aa30b 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -20,10 +20,8 @@
 #ifndef EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
 #define EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XKeyListener.hpp>
 #include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
 
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 3bf59dc1039c..9679bfba4cad 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -30,8 +30,6 @@
 #include "browserpage.hxx"
 #include "linedescriptor.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 //............................................................................
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 0a43a2f4cd79..8cb20f56005e 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -31,9 +31,7 @@
 
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XPropertyControl.hpp>
-/** === end UNO includes === **/
 #include <vcl/tabctrl.hxx>
 #include <comphelper/stl_types.hxx>
 #include <boost/mem_fn.hpp>
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 7532c9aead42..b41c0fc2255a 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -32,11 +32,9 @@
 #include "handlerhelper.hxx"
 #include "formstrings.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-/** === end UNO includes === **/
 
 #include <tools/debug.hxx>
 #include <unotools/confignode.hxx>
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index af68b60ba1fb..56384e8db613 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -24,7 +24,6 @@
 #include "pcrcommon.hxx"
 #include "modulepcr.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -39,7 +38,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
 #include <osl/interlck.h>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx
index 36fcb5427146..1c5f5de66fb0 100644
--- a/extensions/source/propctrlr/propeventtranslation.cxx
+++ b/extensions/source/propctrlr/propeventtranslation.cxx
@@ -19,10 +19,8 @@
 
 #include "propeventtranslation.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
-/** === end UNO includes === **/
 
 //........................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index cfdad684d399..73fa3004e44e 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -20,9 +20,7 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-/** === end UNO includes === **/
 #include <cppuhelper/implbase1.hxx>
 
 //........................................................................
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 11fc70a99546..96d164c50953 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -23,7 +23,6 @@
 #include "modulepcr.hxx"
 #include "unourl.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -39,7 +38,6 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-/** === end UNO includes === **/
 
 #include <svtools/localresaccess.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 7d1cd616af47..c3bf797e58c4 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -20,14 +20,12 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 
 #include <connectivity/dbtools.hxx>
 #include <tools/link.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 0a42576b6bc4..f42f186ae2be 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -29,14 +29,12 @@
 #include "standardcontrol.hxx"
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
-/** === end UNO includes === **/
 #include <comphelper/string.hxx>
 #include <rtl/math.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 6b95f2b6f31f..91bf8a097897 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -23,12 +23,10 @@
 #include "commoncontrol.hxx"
 #include "pcrcommon.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/XNumericControl.hpp>
 #include <com/sun/star/inspection/XStringListControl.hpp>
 #include <com/sun/star/inspection/XHyperlinkControl.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-/** === end UNO includes === **/
 #include <vcl/field.hxx>
 #include <vcl/longcurr.hxx>
 #include <svtools/ctrlbox.hxx>
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 16b19470df46..71f1ec2ee69c 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -31,13 +31,11 @@
 #include "formstrings.hxx"
 #include "handlerhelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/form/submission/XSubmissionSupplier.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index bee254f773ed..f62011ac53e5 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -23,9 +23,7 @@
 #include "propertyhandler.hxx"
 #include "eformshelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/xforms/XSubmission.hpp>
-/** === end UNO includes === **/
 #include <comphelper/propmultiplex.hxx>
 
 namespace comphelper
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 84108c64e4e6..1144e8373a6f 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -28,9 +28,7 @@
 
 #include "usercontrol.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/inspection/PropertyControlType.hpp>
-/** === end UNO includes === **/
 #include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 982fde64fec9..547abdbf948a 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -29,11 +29,9 @@
 #include "xsddatatypes.hxx"
 #include "formstrings.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/xsd/DataTypeClass.hpp>
 #include <com/sun/star/xsd/XDataType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 
 //........................................................................
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index b409ff256db2..743ea3490842 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -20,9 +20,7 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
 
-/** === begin UNO includes === **/
 #include <com/sun/star/uno/Reference.hxx>
-/** === end UNO includes === **/
 #include <rtl/ref.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 54988490b004..327b1a87346b 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -30,14 +30,12 @@
 #include "xsddatatypes.hxx"
 #include "formstrings.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xsd/DataTypeClass.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
-/** === end UNO includes === **/
 #include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx
index b789bef49d05..3311d7f1c93a 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.hxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx
@@ -23,10 +23,8 @@
 #include "eformshelper.hxx"
 #include "xsddatatypes.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/xsd/XDataType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
 #include <rtl/ref.hxx>
 
 //........................................................................
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 0620a5b07dc1..64eefc03f456 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -39,7 +39,6 @@
 #include "pcrcommon.hxx"
 #include "handlerhelper.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
 #include <com/sun/star/xsd/DataTypeClass.hpp>
@@ -47,7 +46,6 @@
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/inspection/PropertyLineElement.hpp>
-/** === end UNO includes === **/
 #include <vcl/msgbox.hxx>
 #include <tools/debug.hxx>
 #include <svtools/localresaccess.hxx>
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index 056ee740b26e..0c9c40245f29 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -22,9 +22,6 @@
 
 #include "propertyhandler.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <memory>
 
 //........................................................................