foward declare NotebookBarAddonsItem instead of using include

Change-Id: I57e5a8f28a40994b61ab0f554401e4f70c8ffc12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111230
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

28 files changed, 35 insertions, 5 deletions

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 4da4b8fc1956..b5d65507fb50 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -45,6 +45,7 @@
 #include <sfx2/progress.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>
+#include <vcl/image.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/weldutils.hxx>
 #include <svl/urihelper.hxx>
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index b34821ff936f..3a177327d256 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/task/XJob.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/resmgr.hxx>
+#include <vcl/image.hxx>
 #include <vcl/window.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/timer.hxx>
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 1551f32e5389..fee6afe96917 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -25,13 +25,16 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/window.hxx>
 #include <vcl/windowstate.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
 #include <memory>
-#include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 
+class SalInstanceBuilder;
+class ScreenshotTest;
 class MenuBar;
 class NotebookBar;
 class TaskPaneList;
 class VclBuilder;
+struct NotebookBarAddonsItem;
 
 #define ICON_LO_DEFAULT                 1
 #define ICON_TEXT_DOCUMENT              2
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index cbda9ee4b6fc..6d72044f4c2f 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -33,6 +33,7 @@
 #include <vcl/abstdlg.hxx>
 
 struct DialogImpl;
+class Button;
 class PushButton;
 class VclBox;
 class VclButtonBox;
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 8a9184f3ee2e..6608912d3f2a 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -21,6 +21,7 @@
 #include <globstr.hrc>
 #include <scresid.hxx>
 
+#include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/dockwin.hxx>
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 579d8d717be3..60cac1a63773 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -21,6 +21,7 @@
 
 #include <string_view>
 
+#include <vcl/image.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 1d3321e0dbb6..95a773c9a7c4 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -25,6 +25,7 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/progress.hxx>
 #include <misc/scopelock.hxx>
+#include <vcl/bitmapex.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/weldutils.hxx>
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 9d358f9dbfd9..9f8cc860669e 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -35,6 +35,7 @@
 #include "PreviewValueSet.hxx"
 #include <ViewShellBase.hxx>
 #include <o3tl/safeint.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/image.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index df7f530f4fea..22893cf34a3a 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -67,6 +67,7 @@
 #include "PaneHider.hxx"
 
 #include <bitmaps.hlst>
+#include <vcl/builder.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/commandinfoprovider.hxx>
diff --git a/sfx2/inc/sidebar/SidebarToolBox.hxx b/sfx2/inc/sidebar/SidebarToolBox.hxx
index 38b49b49c57d..93cd0a9795dc 100644
--- a/sfx2/inc/sidebar/SidebarToolBox.hxx
+++ b/sfx2/inc/sidebar/SidebarToolBox.hxx
@@ -21,6 +21,7 @@
 
 #include <config_options.h>
 #include <sfx2/dllapi.h>
+#include <vcl/builder.hxx>
 #include <vcl/toolbox.hxx>
 #include <map>
 
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 9b8e0afe290e..98f74b605e25 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
 
+#include <vcl/builder.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 4b660cdb7a8e..716a28253c94 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -25,6 +25,7 @@
 #include <unotools/intlwrapper.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/searchopt.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index f4014ffbac8c..ed76ad494b31 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <ooo/vba/word/WdWindowState.hpp>
+#include <sal/log.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index d2565cdc6bf3..2d883c2b4d17 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -24,6 +24,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/frmdirlbox.hxx>
+#include <map>
 #include "colex.hxx"
 #include "prcntfld.hxx"
 
diff --git a/toolkit/source/helper/btndlg.cxx b/toolkit/source/helper/btndlg.cxx
index 5aec00335260..64124928babc 100644
--- a/toolkit/source/helper/btndlg.cxx
+++ b/toolkit/source/helper/btndlg.cxx
@@ -17,13 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
-
 #include <vcl/toolkit/button.hxx>
 #include <vcl/stdtext.hxx>
 #include <helper/btndlg.hxx>
 #include <sal/log.hxx>
-
+#include <map>
+#include <memory>
 
 struct ImplBtnDlgItem
 {
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 5f7a7517a8d0..3f1bc723d36c 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -16,6 +16,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
+#include <vcl/bitmapex.hxx>
 #include <vcl/event.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/vclmain.hxx>
diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
index d2d19dc3b205..4bd837f6b261 100644
--- a/vcl/inc/messagedialog.hxx
+++ b/vcl/inc/messagedialog.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
 
 #include <vcl/toolkit/dialog.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/toolkit/fixed.hxx>
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 0c1a0f67cdf0..79a2d3c98747 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -31,6 +31,8 @@
 #include <tools/stream.hxx>
 
 #include <unotools/configmgr.hxx>
+#include <unotools/resmgr.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/syslocaleoptions.hxx>
 
 #include <vcl/toolkit/dialog.hxx>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 194164946cc6..449199ef7472 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -30,6 +30,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/asyncnotification.hxx>
 #include <i18nlangtag/mslangid.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <vcl/QueueInfo.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/control/NotebookbarPopup.cxx b/vcl/source/control/NotebookbarPopup.cxx
index f382ea19c8f8..7a8aaadc0dd8 100644
--- a/vcl/source/control/NotebookbarPopup.cxx
+++ b/vcl/source/control/NotebookbarPopup.cxx
@@ -9,6 +9,8 @@
 
 #include <vcl/notebookbar/NotebookbarPopup.hxx>
 #include <vcl/notebookbar/IPrioritable.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
 
 NotebookbarPopup::NotebookbarPopup(const VclPtr<VclHBox>& pParent)
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 6f0da1194208..88cf261de242 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/poly.hxx>
 
+#include <vcl/builder.hxx>
 #include <vcl/image.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/decoview.hxx>
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
index 0e425dd29b03..d8955892a1a2 100644
--- a/vcl/source/control/calendar.cxx
+++ b/vcl/source/control/calendar.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/builder.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index c3611d499f84..f9c96478c9b8 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -23,6 +23,7 @@
 
 #include <comphelper/string.hxx>
 #include <vcl/toolkit/lstbox.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 02e1986b497d..0f7528c8a5f4 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include <vcl/builder.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolkit/lstbox.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 470485c05301..25a507d39e82 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -34,6 +34,7 @@
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/notebookbar/IPrioritable.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/toolkit/lstbox.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 499ea856799d..1408a3dc6dd0 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -12,6 +12,7 @@
 #include <o3tl/enumarray.hxx>
 #include <o3tl/enumrange.hxx>
 #include <tools/stream.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/toolkit/button.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/decoview.hxx>
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index bd7753bec9ac..01b26b020b5d 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -27,6 +27,8 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/window.hxx>
 
+#include <map>
+
 class Button;
 
 /** Toolbox that holds the close button (right hand side of the menubar).
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5bbc0f125f3d..0d0c28b15b80 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -26,6 +26,7 @@
 #include <unx/gtk/gtksalmenu.hxx>
 #include <headless/svpvd.hxx>
 #include <headless/svpbmp.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/inputtypes.hxx>
 #include <vcl/transfer.hxx>