de-hrc various things

e.g.  helpid[s].hrc -> helpids.h
and insert include guards where missing

move "ordinary" defines into .hxx files

remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead

Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e

28 files changed, 175 insertions, 319 deletions

diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc
deleted file mode 100644
index a55a687876a2..000000000000
--- a/extensions/inc/abpilot.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef EXTENSIONS_ABPILOT_HRC
-#define EXTENSIONS_ABPILOT_HRC
-
-#define HID_ABSPILOT_PREVIOUS                           "EXTENSIONS_HID_ABSPILOT_PREVIOUS"
-#define HID_ABSPILOT_NEXT                               "EXTENSIONS_HID_ABSPILOT_NEXT"
-#define HID_ABSPILOT_CANCEL                             "EXTENSIONS_HID_ABSPILOT_CANCEL"
-#define HID_ABSPILOT_FINISH                             "EXTENSIONS_HID_ABSPILOT_FINISH"
-#define UID_ABSPILOT_HELP                               "EXTENSIONS_UID_ABSPILOT_HELP"
-#define HID_ABSPILOT                                    "EXTENSIONS_HID_ABSPILOT"
-
-#endif // EXTENSIONS_ABPILOT_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
deleted file mode 100644
index 9316e19073c1..000000000000
--- a/extensions/inc/bibliography.hrc
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef EXTENSIONS_BIBLIOGRAPHY_HRC
-#define EXTENSIONS_BIBLIOGRAPHY_HRC
-
-#define HID_BIB_IDENTIFIER_POS                          "EXTENSIONS_HID_BIB_IDENTIFIER_POS"
-#define HID_BIB_AUTHORITYTYPE_POS                       "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS"
-#define HID_BIB_AUTHOR_POS                              "EXTENSIONS_HID_BIB_AUTHOR_POS"
-#define HID_BIB_TITLE_POS                               "EXTENSIONS_HID_BIB_TITLE_POS"
-#define HID_BIB_YEAR_POS                                "EXTENSIONS_HID_BIB_YEAR_POS"
-#define HID_BIB_ISBN_POS                                "EXTENSIONS_HID_BIB_ISBN_POS"
-#define HID_BIB_BOOKTITLE_POS                           "EXTENSIONS_HID_BIB_BOOKTITLE_POS"
-#define HID_BIB_CHAPTER_POS                             "EXTENSIONS_HID_BIB_CHAPTER_POS"
-#define HID_BIB_EDITION_POS                             "EXTENSIONS_HID_BIB_EDITION_POS"
-#define HID_BIB_EDITOR_POS                              "EXTENSIONS_HID_BIB_EDITOR_POS"
-#define HID_BIB_HOWPUBLISHED_POS                        "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS"
-#define HID_BIB_INSTITUTION_POS                         "EXTENSIONS_HID_BIB_INSTITUTION_POS"
-#define HID_BIB_JOURNAL_POS                             "EXTENSIONS_HID_BIB_JOURNAL_POS"
-#define HID_BIB_MONTH_POS                               "EXTENSIONS_HID_BIB_MONTH_POS"
-#define HID_BIB_NOTE_POS                                "EXTENSIONS_HID_BIB_NOTE_POS"
-#define HID_BIB_ANNOTE_POS                              "EXTENSIONS_HID_BIB_ANNOTE_POS"
-#define HID_BIB_NUMBER_POS                              "EXTENSIONS_HID_BIB_NUMBER_POS"
-#define HID_BIB_ORGANIZATIONS_POS                       "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS"
-#define HID_BIB_PAGES_POS                               "EXTENSIONS_HID_BIB_PAGES_POS"
-#define HID_BIB_PUBLISHER_POS                           "EXTENSIONS_HID_BIB_PUBLISHER_POS"
-#define HID_BIB_ADDRESS_POS                             "EXTENSIONS_HID_BIB_ADDRESS_POS"
-#define HID_BIB_SCHOOL_POS                              "EXTENSIONS_HID_BIB_SCHOOL_POS"
-#define HID_BIB_SERIES_POS                              "EXTENSIONS_HID_BIB_SERIES_POS"
-#define HID_BIB_REPORTTYPE_POS                          "EXTENSIONS_HID_BIB_REPORTTYPE_POS"
-#define HID_BIB_VOLUME_POS                              "EXTENSIONS_HID_BIB_VOLUME_POS"
-#define HID_BIB_URL_POS                                 "EXTENSIONS_HID_BIB_URL_POS"
-#define HID_BIB_CUSTOM1_POS                             "EXTENSIONS_HID_BIB_CUSTOM1_POS"
-#define HID_BIB_CUSTOM2_POS                             "EXTENSIONS_HID_BIB_CUSTOM2_POS"
-#define HID_BIB_CUSTOM3_POS                             "EXTENSIONS_HID_BIB_CUSTOM3_POS"
-#define HID_BIB_CUSTOM4_POS                             "EXTENSIONS_HID_BIB_CUSTOM4_POS"
-#define HID_BIB_CUSTOM5_POS                             "EXTENSIONS_HID_BIB_CUSTOM5_POS"
-#define HID_BIB_DB_GRIDCTRL                             "EXTENSIONS_HID_BIB_DB_GRIDCTRL"
-
-#endif // EXTENSIONS_BIBLIOGRAPHY_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc
deleted file mode 100644
index e0de9c57e007..000000000000
--- a/extensions/inc/dbpilots.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef EXTENSIONS_DBPILOT_HRC
-#define EXTENSIONS_DBPILOT_HRC
-
-#define HID_GROUPWIZARD_PREVIOUS                        "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS"
-#define HID_GROUPWIZARD_NEXT                            "EXTENSIONS_HID_GROUPWIZARD_NEXT"
-#define HID_GROUPWIZARD_CANCEL                          "EXTENSIONS_HID_GROUPWIZARD_CANCEL"
-#define HID_GROUPWIZARD_FINISH                          "EXTENSIONS_HID_GROUPWIZARD_FINISH"
-#define HID_LISTWIZARD_PREVIOUS                         "EXTENSIONS_HID_LISTWIZARD_PREVIOUS"
-#define HID_LISTWIZARD_NEXT                             "EXTENSIONS_HID_LISTWIZARD_NEXT"
-#define HID_LISTWIZARD_CANCEL                           "EXTENSIONS_HID_LISTWIZARD_CANCEL"
-#define HID_LISTWIZARD_FINISH                           "EXTENSIONS_HID_LISTWIZARD_FINISH"
-#define HID_GRIDWIZARD_PREVIOUS                         "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS"
-#define HID_GRIDWIZARD_NEXT                             "EXTENSIONS_HID_GRIDWIZARD_NEXT"
-#define HID_GRIDWIZARD_CANCEL                           "EXTENSIONS_HID_GRIDWIZARD_CANCEL"
-#define HID_GRIDWIZARD_FINISH                           "EXTENSIONS_HID_GRIDWIZARD_FINISH"
-
-#endif // EXTENSIONS_DBPILOT_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc
deleted file mode 100644
index 36ec5bba52f5..000000000000
--- a/extensions/inc/extensio.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef EXTENSIONS_INC_EXTENSIO_HRC
-#define EXTENSIONS_INC_EXTENSIO_HRC
-
-#include <svl/solar.hrc>
-
-// - resource id ranges
-
-#define RID_ABP_START       ( RID_MORE_EXTENSIONS_START +   0 )
-#define RID_ABP_END         ( RID_MORE_EXTENSIONS_START +  19 )
-
-#define RID_DBP_START       ( RID_MORE_EXTENSIONS_START +  20 )
-#define RID_DBP_END         ( RID_MORE_EXTENSIONS_START +  39 )
-
-// !!! please adjust RID_LAST_EXTENSIONS_RANGE if you add new ranges here !!!
-
-#define RID_LAST_EXTENSIONS_RANGE RID_DBP_END
-
-#if RID_LAST_EXTENSIONS_RANGE > RID_MORE_EXTENSIONS_END
-    #error id range overflow
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/helpids.h
index 2af190270a16..813bd3b502fd 100644
--- a/extensions/inc/propctrlr.hrc
+++ b/extensions/inc/helpids.h
@@ -17,67 +17,61 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_PROPCTRLR_HRC
-#define EXTENSIONS_PROPCTRLR_HRC
+#ifndef EXTENSIONS_HELPIDS_H
+#define EXTENSIONS_HELPIDS_H
 
-#define UID_PROP_DLG_FONT_TYPE                          "EXTENSIONS_UID_PROP_DLG_FONT_TYPE"
-#define UID_PROP_DLG_IMAGE_URL                          "EXTENSIONS_UID_PROP_DLG_IMAGE_URL"
-#define UID_PROP_DLG_BACKGROUNDCOLOR                    "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR"
-#define UID_PROP_DLG_SYMBOLCOLOR                        "EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR"
-#define UID_PROP_DLG_ATTR_DATASOURCE                    "EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE"
-#define UID_PROP_DLG_ATTR_TARGET_URL                    "EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL"
-#define UID_PROP_DLG_NUMBER_FORMAT                      "EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT"
-#define UID_PROP_DLG_CONTROLLABEL                       "EXTENSIONS_UID_PROP_DLG_CONTROLLABEL"
-#define UID_PROP_DLG_FILLCOLOR                          "EXTENSIONS_UID_PROP_DLG_FILLCOLOR"
-#define UID_PROP_DLG_TABINDEX                           "EXTENSIONS_UID_PROP_DLG_TABINDEX"
-#define UID_PROP_DLG_SQLCOMMAND                         "EXTENSIONS_UID_PROP_DLG_SQLCOMMAND"
-#define UID_PROP_DLG_FORMLINKFIELDS                     "EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS"
-#define UID_PROP_DLG_FILTER                             "EXTENSIONS_UID_PROP_DLG_FILTER"
-#define UID_PROP_DLG_ORDER                              "EXTENSIONS_UID_PROP_DLG_ORDER"
-#define UID_PROP_DLG_SELECTION                          "EXTENSIONS_UID_PROP_DLG_SELECTION"
-#define UID_PROP_DLG_BIND_EXPRESSION                    "EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION"
-#define UID_PROP_DLG_XSD_REQUIRED                       "EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED"
-#define UID_PROP_DLG_XSD_RELEVANT                       "EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT"
-#define UID_PROP_DLG_XSD_READONLY                       "EXTENSIONS_UID_PROP_DLG_XSD_READONLY"
-#define UID_PROP_DLG_XSD_CONSTRAINT                     "EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT"
-#define UID_PROP_DLG_XSD_CALCULATION                    "EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION"
-#define UID_PROP_ADD_DATA_TYPE                          "EXTENSIONS_UID_PROP_ADD_DATA_TYPE"
-#define UID_PROP_REMOVE_DATA_TYPE                       "EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE"
-#define UID_PROP_DLG_BORDERCOLOR                        "EXTENSIONS_UID_PROP_DLG_BORDERCOLOR"
+#define HID_ABSPILOT_PREVIOUS                           "EXTENSIONS_HID_ABSPILOT_PREVIOUS"
+#define HID_ABSPILOT_NEXT                               "EXTENSIONS_HID_ABSPILOT_NEXT"
+#define HID_ABSPILOT_CANCEL                             "EXTENSIONS_HID_ABSPILOT_CANCEL"
+#define HID_ABSPILOT_FINISH                             "EXTENSIONS_HID_ABSPILOT_FINISH"
+#define UID_ABSPILOT_HELP                               "EXTENSIONS_UID_ABSPILOT_HELP"
+#define HID_ABSPILOT                                    "EXTENSIONS_HID_ABSPILOT"
 
-#define UID_BRWEVT_APPROVEACTIONPERFORMED               "EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED"
-#define UID_BRWEVT_ACTIONPERFORMED                      "EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED"
-#define UID_BRWEVT_CHANGED                              "EXTENSIONS_UID_BRWEVT_CHANGED"
-#define UID_BRWEVT_TEXTCHANGED                          "EXTENSIONS_UID_BRWEVT_TEXTCHANGED"
-#define UID_BRWEVT_ITEMSTATECHANGED                     "EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED"
-#define UID_BRWEVT_FOCUSGAINED                          "EXTENSIONS_UID_BRWEVT_FOCUSGAINED"
-#define UID_BRWEVT_FOCUSLOST                            "EXTENSIONS_UID_BRWEVT_FOCUSLOST"
-#define UID_BRWEVT_KEYTYPED                             "EXTENSIONS_UID_BRWEVT_KEYTYPED"
-#define UID_BRWEVT_KEYUP                                "EXTENSIONS_UID_BRWEVT_KEYUP"
-#define UID_BRWEVT_MOUSEENTERED                         "EXTENSIONS_UID_BRWEVT_MOUSEENTERED"
-#define UID_BRWEVT_MOUSEDRAGGED                         "EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED"
-#define UID_BRWEVT_MOUSEMOVED                           "EXTENSIONS_UID_BRWEVT_MOUSEMOVED"
-#define UID_BRWEVT_MOUSEPRESSED                         "EXTENSIONS_UID_BRWEVT_MOUSEPRESSED"
-#define UID_BRWEVT_MOUSERELEASED                        "EXTENSIONS_UID_BRWEVT_MOUSERELEASED"
-#define UID_BRWEVT_MOUSEEXITED                          "EXTENSIONS_UID_BRWEVT_MOUSEEXITED"
-#define UID_BRWEVT_APPROVERESETTED                      "EXTENSIONS_UID_BRWEVT_APPROVERESETTED"
-#define UID_BRWEVT_RESETTED                             "EXTENSIONS_UID_BRWEVT_RESETTED"
-#define UID_BRWEVT_SUBMITTED                            "EXTENSIONS_UID_BRWEVT_SUBMITTED"
-#define UID_BRWEVT_BEFOREUPDATE                         "EXTENSIONS_UID_BRWEVT_BEFOREUPDATE"
-#define UID_BRWEVT_AFTERUPDATE                          "EXTENSIONS_UID_BRWEVT_AFTERUPDATE"
-#define UID_BRWEVT_LOADED                               "EXTENSIONS_UID_BRWEVT_LOADED"
-#define UID_BRWEVT_RELOADING                            "EXTENSIONS_UID_BRWEVT_RELOADING"
-#define UID_BRWEVT_RELOADED                             "EXTENSIONS_UID_BRWEVT_RELOADED"
-#define UID_BRWEVT_UNLOADING                            "EXTENSIONS_UID_BRWEVT_UNLOADING"
-#define UID_BRWEVT_UNLOADED                             "EXTENSIONS_UID_BRWEVT_UNLOADED"
-#define UID_BRWEVT_CONFIRMDELETE                        "EXTENSIONS_UID_BRWEVT_CONFIRMDELETE"
-#define UID_BRWEVT_APPROVEROWCHANGE                     "EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE"
-#define UID_BRWEVT_ROWCHANGE                            "EXTENSIONS_UID_BRWEVT_ROWCHANGE"
-#define UID_BRWEVT_POSITIONING                          "EXTENSIONS_UID_BRWEVT_POSITIONING"
-#define UID_BRWEVT_POSITIONED                           "EXTENSIONS_UID_BRWEVT_POSITIONED"
-#define UID_BRWEVT_APPROVEPARAMETER                     "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER"
-#define UID_BRWEVT_ERROROCCURRED                        "EXTENSIONS_UID_BRWEVT_ERROROCCURRED"
-#define UID_BRWEVT_ADJUSTMENTVALUECHANGED               "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED"
+#define HID_BIB_IDENTIFIER_POS                          "EXTENSIONS_HID_BIB_IDENTIFIER_POS"
+#define HID_BIB_AUTHORITYTYPE_POS                       "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS"
+#define HID_BIB_AUTHOR_POS                              "EXTENSIONS_HID_BIB_AUTHOR_POS"
+#define HID_BIB_TITLE_POS                               "EXTENSIONS_HID_BIB_TITLE_POS"
+#define HID_BIB_YEAR_POS                                "EXTENSIONS_HID_BIB_YEAR_POS"
+#define HID_BIB_ISBN_POS                                "EXTENSIONS_HID_BIB_ISBN_POS"
+#define HID_BIB_BOOKTITLE_POS                           "EXTENSIONS_HID_BIB_BOOKTITLE_POS"
+#define HID_BIB_CHAPTER_POS                             "EXTENSIONS_HID_BIB_CHAPTER_POS"
+#define HID_BIB_EDITION_POS                             "EXTENSIONS_HID_BIB_EDITION_POS"
+#define HID_BIB_EDITOR_POS                              "EXTENSIONS_HID_BIB_EDITOR_POS"
+#define HID_BIB_HOWPUBLISHED_POS                        "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS"
+#define HID_BIB_INSTITUTION_POS                         "EXTENSIONS_HID_BIB_INSTITUTION_POS"
+#define HID_BIB_JOURNAL_POS                             "EXTENSIONS_HID_BIB_JOURNAL_POS"
+#define HID_BIB_MONTH_POS                               "EXTENSIONS_HID_BIB_MONTH_POS"
+#define HID_BIB_NOTE_POS                                "EXTENSIONS_HID_BIB_NOTE_POS"
+#define HID_BIB_ANNOTE_POS                              "EXTENSIONS_HID_BIB_ANNOTE_POS"
+#define HID_BIB_NUMBER_POS                              "EXTENSIONS_HID_BIB_NUMBER_POS"
+#define HID_BIB_ORGANIZATIONS_POS                       "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS"
+#define HID_BIB_PAGES_POS                               "EXTENSIONS_HID_BIB_PAGES_POS"
+#define HID_BIB_PUBLISHER_POS                           "EXTENSIONS_HID_BIB_PUBLISHER_POS"
+#define HID_BIB_ADDRESS_POS                             "EXTENSIONS_HID_BIB_ADDRESS_POS"
+#define HID_BIB_SCHOOL_POS                              "EXTENSIONS_HID_BIB_SCHOOL_POS"
+#define HID_BIB_SERIES_POS                              "EXTENSIONS_HID_BIB_SERIES_POS"
+#define HID_BIB_REPORTTYPE_POS                          "EXTENSIONS_HID_BIB_REPORTTYPE_POS"
+#define HID_BIB_VOLUME_POS                              "EXTENSIONS_HID_BIB_VOLUME_POS"
+#define HID_BIB_URL_POS                                 "EXTENSIONS_HID_BIB_URL_POS"
+#define HID_BIB_CUSTOM1_POS                             "EXTENSIONS_HID_BIB_CUSTOM1_POS"
+#define HID_BIB_CUSTOM2_POS                             "EXTENSIONS_HID_BIB_CUSTOM2_POS"
+#define HID_BIB_CUSTOM3_POS                             "EXTENSIONS_HID_BIB_CUSTOM3_POS"
+#define HID_BIB_CUSTOM4_POS                             "EXTENSIONS_HID_BIB_CUSTOM4_POS"
+#define HID_BIB_CUSTOM5_POS                             "EXTENSIONS_HID_BIB_CUSTOM5_POS"
+#define HID_BIB_DB_GRIDCTRL                             "EXTENSIONS_HID_BIB_DB_GRIDCTRL"
+
+#define HID_GROUPWIZARD_PREVIOUS                        "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS"
+#define HID_GROUPWIZARD_NEXT                            "EXTENSIONS_HID_GROUPWIZARD_NEXT"
+#define HID_GROUPWIZARD_CANCEL                          "EXTENSIONS_HID_GROUPWIZARD_CANCEL"
+#define HID_GROUPWIZARD_FINISH                          "EXTENSIONS_HID_GROUPWIZARD_FINISH"
+#define HID_LISTWIZARD_PREVIOUS                         "EXTENSIONS_HID_LISTWIZARD_PREVIOUS"
+#define HID_LISTWIZARD_NEXT                             "EXTENSIONS_HID_LISTWIZARD_NEXT"
+#define HID_LISTWIZARD_CANCEL                           "EXTENSIONS_HID_LISTWIZARD_CANCEL"
+#define HID_LISTWIZARD_FINISH                           "EXTENSIONS_HID_LISTWIZARD_FINISH"
+#define HID_GRIDWIZARD_PREVIOUS                         "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS"
+#define HID_GRIDWIZARD_NEXT                             "EXTENSIONS_HID_GRIDWIZARD_NEXT"
+#define HID_GRIDWIZARD_CANCEL                           "EXTENSIONS_HID_GRIDWIZARD_CANCEL"
+#define HID_GRIDWIZARD_FINISH                           "EXTENSIONS_HID_GRIDWIZARD_FINISH"
 
 #define HID_PROP_INPUT_REQUIRED                         "EXTENSIONS_HID_PROP_INPUT_REQUIRED"
 #define HID_PROP_GROUPBOX                               "EXTENSIONS_HID_PROP_GROUPBOX"
@@ -314,6 +308,17 @@
 #define HID_FM_PROPDLG_TAB_EVT                          "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT"
 #define HID_PROP_GROUP_NAME                             "EXTENSIONS_HID_PROP_GROUP_NAME"
 
-#endif // EXTENSIONS_PROPCTRLR_HRC
+#define HID_CHECK_FOR_UPD_DLG                           "EXTENSIONS_HID_CHECK_FOR_UPD_DLG"
+#define HID_CHECK_FOR_UPD_CLOSE                         "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE"
+#define HID_CHECK_FOR_UPD_PAUSE                         "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE"
+#define HID_CHECK_FOR_UPD_RESUME                        "EXTENSIONS_HID_CHECK_FOR_UPD_RESUME"
+#define HID_CHECK_FOR_UPD_DOWNLOAD                      "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD"
+#define HID_CHECK_FOR_UPD_DOWNLOAD2                     "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2"
+#define HID_CHECK_FOR_UPD_INSTALL                       "EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL"
+#define HID_CHECK_FOR_UPD_STATUS                        "EXTENSIONS_HID_CHECK_FOR_UPD_STATUS"
+#define HID_CHECK_FOR_UPD_DESCRIPTION                   "EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION"
+#define HID_CHECK_FOR_UPD_CANCEL                        "EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL"
+
+#endif // EXTENSIONS_ABPILOT_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/propctrlr.h b/extensions/inc/propctrlr.h
new file mode 100644
index 000000000000..9a819cc08c25
--- /dev/null
+++ b/extensions/inc/propctrlr.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef EXTENSIONS_PROPCTRLR_H
+#define EXTENSIONS_PROPCTRLR_H
+
+#define UID_PROP_DLG_FONT_TYPE                          "EXTENSIONS_UID_PROP_DLG_FONT_TYPE"
+#define UID_PROP_DLG_IMAGE_URL                          "EXTENSIONS_UID_PROP_DLG_IMAGE_URL"
+#define UID_PROP_DLG_BACKGROUNDCOLOR                    "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR"
+#define UID_PROP_DLG_SYMBOLCOLOR                        "EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR"
+#define UID_PROP_DLG_ATTR_DATASOURCE                    "EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE"
+#define UID_PROP_DLG_ATTR_TARGET_URL                    "EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL"
+#define UID_PROP_DLG_NUMBER_FORMAT                      "EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT"
+#define UID_PROP_DLG_CONTROLLABEL                       "EXTENSIONS_UID_PROP_DLG_CONTROLLABEL"
+#define UID_PROP_DLG_FILLCOLOR                          "EXTENSIONS_UID_PROP_DLG_FILLCOLOR"
+#define UID_PROP_DLG_TABINDEX                           "EXTENSIONS_UID_PROP_DLG_TABINDEX"
+#define UID_PROP_DLG_SQLCOMMAND                         "EXTENSIONS_UID_PROP_DLG_SQLCOMMAND"
+#define UID_PROP_DLG_FORMLINKFIELDS                     "EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS"
+#define UID_PROP_DLG_FILTER                             "EXTENSIONS_UID_PROP_DLG_FILTER"
+#define UID_PROP_DLG_ORDER                              "EXTENSIONS_UID_PROP_DLG_ORDER"
+#define UID_PROP_DLG_SELECTION                          "EXTENSIONS_UID_PROP_DLG_SELECTION"
+#define UID_PROP_DLG_BIND_EXPRESSION                    "EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION"
+#define UID_PROP_DLG_XSD_REQUIRED                       "EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED"
+#define UID_PROP_DLG_XSD_RELEVANT                       "EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT"
+#define UID_PROP_DLG_XSD_READONLY                       "EXTENSIONS_UID_PROP_DLG_XSD_READONLY"
+#define UID_PROP_DLG_XSD_CONSTRAINT                     "EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT"
+#define UID_PROP_DLG_XSD_CALCULATION                    "EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION"
+#define UID_PROP_ADD_DATA_TYPE                          "EXTENSIONS_UID_PROP_ADD_DATA_TYPE"
+#define UID_PROP_REMOVE_DATA_TYPE                       "EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE"
+#define UID_PROP_DLG_BORDERCOLOR                        "EXTENSIONS_UID_PROP_DLG_BORDERCOLOR"
+
+#define UID_BRWEVT_APPROVEACTIONPERFORMED               "EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED"
+#define UID_BRWEVT_ACTIONPERFORMED                      "EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED"
+#define UID_BRWEVT_CHANGED                              "EXTENSIONS_UID_BRWEVT_CHANGED"
+#define UID_BRWEVT_TEXTCHANGED                          "EXTENSIONS_UID_BRWEVT_TEXTCHANGED"
+#define UID_BRWEVT_ITEMSTATECHANGED                     "EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED"
+#define UID_BRWEVT_FOCUSGAINED                          "EXTENSIONS_UID_BRWEVT_FOCUSGAINED"
+#define UID_BRWEVT_FOCUSLOST                            "EXTENSIONS_UID_BRWEVT_FOCUSLOST"
+#define UID_BRWEVT_KEYTYPED                             "EXTENSIONS_UID_BRWEVT_KEYTYPED"
+#define UID_BRWEVT_KEYUP                                "EXTENSIONS_UID_BRWEVT_KEYUP"
+#define UID_BRWEVT_MOUSEENTERED                         "EXTENSIONS_UID_BRWEVT_MOUSEENTERED"
+#define UID_BRWEVT_MOUSEDRAGGED                         "EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED"
+#define UID_BRWEVT_MOUSEMOVED                           "EXTENSIONS_UID_BRWEVT_MOUSEMOVED"
+#define UID_BRWEVT_MOUSEPRESSED                         "EXTENSIONS_UID_BRWEVT_MOUSEPRESSED"
+#define UID_BRWEVT_MOUSERELEASED                        "EXTENSIONS_UID_BRWEVT_MOUSERELEASED"
+#define UID_BRWEVT_MOUSEEXITED                          "EXTENSIONS_UID_BRWEVT_MOUSEEXITED"
+#define UID_BRWEVT_APPROVERESETTED                      "EXTENSIONS_UID_BRWEVT_APPROVERESETTED"
+#define UID_BRWEVT_RESETTED                             "EXTENSIONS_UID_BRWEVT_RESETTED"
+#define UID_BRWEVT_SUBMITTED                            "EXTENSIONS_UID_BRWEVT_SUBMITTED"
+#define UID_BRWEVT_BEFOREUPDATE                         "EXTENSIONS_UID_BRWEVT_BEFOREUPDATE"
+#define UID_BRWEVT_AFTERUPDATE                          "EXTENSIONS_UID_BRWEVT_AFTERUPDATE"
+#define UID_BRWEVT_LOADED                               "EXTENSIONS_UID_BRWEVT_LOADED"
+#define UID_BRWEVT_RELOADING                            "EXTENSIONS_UID_BRWEVT_RELOADING"
+#define UID_BRWEVT_RELOADED                             "EXTENSIONS_UID_BRWEVT_RELOADED"
+#define UID_BRWEVT_UNLOADING                            "EXTENSIONS_UID_BRWEVT_UNLOADING"
+#define UID_BRWEVT_UNLOADED                             "EXTENSIONS_UID_BRWEVT_UNLOADED"
+#define UID_BRWEVT_CONFIRMDELETE                        "EXTENSIONS_UID_BRWEVT_CONFIRMDELETE"
+#define UID_BRWEVT_APPROVEROWCHANGE                     "EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE"
+#define UID_BRWEVT_ROWCHANGE                            "EXTENSIONS_UID_BRWEVT_ROWCHANGE"
+#define UID_BRWEVT_POSITIONING                          "EXTENSIONS_UID_BRWEVT_POSITIONING"
+#define UID_BRWEVT_POSITIONED                           "EXTENSIONS_UID_BRWEVT_POSITIONED"
+#define UID_BRWEVT_APPROVEPARAMETER                     "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER"
+#define UID_BRWEVT_ERROROCCURRED                        "EXTENSIONS_UID_BRWEVT_ERROROCCURRED"
+#define UID_BRWEVT_ADJUSTMENTVALUECHANGED               "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED"
+
+#endif // EXTENSIONS_PROPCTRLR_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc
deleted file mode 100644
index 35fdd39e3e76..000000000000
--- a/extensions/inc/update.hrc
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef EXTENSIONS_UPDATE_HRC
-#define EXTENSIONS_UPDATE_HRC
-
-#define HID_CHECK_FOR_UPD_DLG                           "EXTENSIONS_HID_CHECK_FOR_UPD_DLG"
-#define HID_CHECK_FOR_UPD_CLOSE                         "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE"
-#define HID_CHECK_FOR_UPD_PAUSE                         "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE"
-#define HID_CHECK_FOR_UPD_RESUME                        "EXTENSIONS_HID_CHECK_FOR_UPD_RESUME"
-#define HID_CHECK_FOR_UPD_DOWNLOAD                      "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD"
-#define HID_CHECK_FOR_UPD_DOWNLOAD2                     "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2"
-#define HID_CHECK_FOR_UPD_INSTALL                       "EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL"
-#define HID_CHECK_FOR_UPD_STATUS                        "EXTENSIONS_HID_CHECK_FOR_UPD_STATUS"
-#define HID_CHECK_FOR_UPD_DESCRIPTION                   "EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION"
-#define HID_CHECK_FOR_UPD_CANCEL                        "EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL"
-
-#endif // EXTENSIONS_UPDATE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 8223c1a35f0f..ca485fee4bdb 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "abspilot.hxx"
-#include "abpilot.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "componentmodule.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index c34b99164e74..4637a3f41c62 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
-#include "bibliography.hrc"
+#include "helpids.h"
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 9e0c7e30f3a1..c40b83b2ac68 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XLocalizable.hpp>
 
 #include "bibmod.hxx"
-#include "bibprop.hrc"
+#include "bibprop.hxx"
 #include "bibview.hxx"
 #include "bibresid.hxx"
 #include "datman.hxx"
diff --git a/extensions/source/bibliography/bibprop.hrc b/extensions/source/bibliography/bibprop.hxx
index 46d6d40c9291..21261dc5ad76 100644
--- a/extensions/source/bibliography/bibprop.hrc
+++ b/extensions/source/bibliography/bibprop.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HRC
-#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HRC
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
 
 extern rtl::OUString FM_PROP_LABEL;
 extern rtl::OUString FM_PROP_NAME;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 87d7e1b1eafa..9890daa05654 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -64,13 +64,13 @@
 #include "bibresid.hxx"
 #include "bibmod.hxx"
 #include "bibview.hxx"
-#include "bibprop.hrc"
+#include "bibprop.hxx"
 #include "toolbar.hxx"
 #include "bibconfig.hxx"
 #include "bibbeam.hxx"
 #include "general.hxx"
 #include "strings.hrc"
-#include "bibliography.hrc"
+#include "helpids.h"
 #include <connectivity/dbtools.hxx>
 #include <memory>
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 23e00ac58232..4f7f811fb5a5 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -32,7 +32,7 @@
 #include "bibconfig.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
-#include "bibliography.hrc"
+#include "helpids.h"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 55389976bab9..d20e53d61a6f 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -32,12 +32,12 @@
 #include "bibresid.hxx"
 #include "datman.hxx"
 #include "bibconfig.hxx"
-#include "bibprop.hrc"
+#include "bibprop.hxx"
 #include "strings.hrc"
 #include "bibmod.hxx"
 #include "bibview.hxx"
 #include "bibtools.hxx"
-#include "bibliography.hrc"
+#include "helpids.h"
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index bdc61e2461d1..efb95571eed2 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -30,7 +30,7 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include "dbptools.hxx"
-#include "dbpilots.hrc"
+#include "helpids.h"
 
 #define GW_STATE_DATASOURCE_SELECTION   0
 #define GW_STATE_FIELDSELECTION         1
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 269715e3e86b..740d8fe15d72 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include "optiongrouplayouter.hxx"
-#include "dbpilots.hrc"
+#include "helpids.h"
 #include <comphelper/processfactory.hxx>
 
 #define GBW_STATE_OPTIONLIST        0
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index a3899444c1d1..17b6894fc5d9 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -27,7 +27,7 @@
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
 #include <connectivity/dbtools.hxx>
-#include "dbpilots.hrc"
+#include "helpids.h"
 #include <comphelper/extract.hxx>
 
 
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 48f19b53bae9..86629b5e0024 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -19,7 +19,8 @@
 
 #include "browserview.hxx"
 #include "propertyeditor.hxx"
-#include "propctrlr.hrc"
+#include "helpids.h"
+#include "propctrlr.h"
 #include <vcl/tabpage.hxx>
 #include <memory>
 
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 21c2eaf2331a..475ad3f247a4 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -20,10 +20,11 @@
 #include "defaultforminspection.hxx"
 #include "pcrcommon.hxx"
 #include "pcrservices.hxx"
+#include "helpids.h"
 #include "strings.hrc"
 #include "strings.hrc"
 #include "modulepcr.hxx"
-#include "propctrlr.hrc"
+#include "propctrlr.h"
 #include "formmetadata.hxx"
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 45e106db0b0f..5593fce5e1bf 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -21,7 +21,7 @@
 #include "formstrings.hxx"
 #include "formmetadata.hxx"
 #include "pcrservices.hxx"
-#include "propctrlr.hrc"
+#include "propctrlr.h"
 #include "formbrowsertools.hxx"
 #include "eformshelper.hxx"
 #include "handlerhelper.hxx"
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index b33fc45f1605..9b690dbd135c 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -20,7 +20,8 @@
 
 #include "eventhandler.hxx"
 #include "pcrservices.hxx"
-#include "propctrlr.hrc"
+#include "helpids.h"
+#include "propctrlr.h"
 #include "formbrowsertools.hxx"
 #include "strings.hrc"
 #include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index cf53f9428941..cfd0ce7cf7d0 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -20,8 +20,7 @@
 
 #include "controltype.hxx"
 #include "pcrservices.hxx"
-#include "propctrlr.hrc"
-#include "extensio.hrc"
+#include "propctrlr.h"
 #include "fontdialog.hxx"
 #include "formcomponenthandler.hxx"
 #include "formlinkdialog.hxx"
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index a65eb6eabdaf..27258f949977 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -22,7 +22,7 @@
 #include "pcrservices.hxx"
 #include "formstrings.hxx"
 #include "defaultforminspection.hxx"
-#include "propctrlr.hrc"
+#include "propctrlr.h"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/VetoException.hpp>
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index d0f375f2bcde..334c4cbc8292 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -20,9 +20,10 @@
 #include "formmetadata.hxx"
 #include "formstrings.hxx"
 #include "command.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "stringarrays.hrc"
-#include "propctrlr.hrc"
+#include "propctrlr.h"
 #include <comphelper/extract.hxx>
 #include <osl/diagnose.h>
 #include <sal/macros.h>
diff --git a/extensions/source/propctrlr/listselectiondlg.hrc b/extensions/source/propctrlr/listselectiondlg.hrc
deleted file mode 100644
index ee62daa5fd5c..000000000000
--- a/extensions/source/propctrlr/listselectiondlg.hrc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
-#define EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
-
-#define PB_OK       1
-#define PB_CANCEL   2
-#define PB_HELP     3
-
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index c9a077234fe2..b79323790cc3 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -26,7 +26,7 @@
 #include "xsddatatypes.hxx"
 #include "modulepcr.hxx"
 #include "strings.hrc"
-#include "propctrlr.hrc"
+#include "propctrlr.h"
 #include "newdatatype.hxx"
 #include "xsdvalidationhelper.hxx"
 #include "pcrcommon.hxx"
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 503552261f63..4c4eca89b045 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -19,7 +19,7 @@
 
 
 #include "updatehdl.hxx"
-#include "update.hrc"
+#include "helpids.h"
 
 #include "osl/diagnose.h"
 #include "osl/thread.hxx"
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 4afdda908a1a..2b62b30f1990 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -46,7 +46,6 @@
 #include <vcl/button.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <sfx2/sfx.hrc>
 #include <sfx2/strings.hrc>
 #include "rtl/ustrbuf.hxx"