diff --git a/framework/audio/engine/internal/iexecoperation.h b/framework/audio/engine/internal/iexecoperation.h
index 6a7eef5bf9..c83c5ec8c9 100644
--- a/framework/audio/engine/internal/iexecoperation.h
+++ b/framework/audio/engine/internal/iexecoperation.h
@@ -22,6 +22,8 @@
 
  #pragma once
 
+#include <functional>
+
 namespace muse::audio::engine {
 //! NOTE When commands arrive at the engine, it exec them.
 //! These can be quick commands like changing the volume,
diff --git a/framework/cloud/internal/abstractcloudservice.cpp b/framework/cloud/internal/abstractcloudservice.cpp
index ff4f9cb951..72dcdf1f80 100644
--- a/framework/cloud/internal/abstractcloudservice.cpp
+++ b/framework/cloud/internal/abstractcloudservice.cpp
@@ -29,6 +29,8 @@
 #include <QUrlQuery>
 #include <QHttpMultiPart>
 #include <QRandomGenerator>
+#include <QEventLoop>
+#include <QTimer>
 
 #include "clouderrors.h"
 #include "multiwindows/resourcelockguard.h"
diff --git a/framework/cloud/musescorecom/musescorecomservice.cpp b/framework/cloud/musescorecom/musescorecomservice.cpp
index 4e2fe53188..1000c7e856 100644
--- a/framework/cloud/musescorecom/musescorecomservice.cpp
+++ b/framework/cloud/musescorecom/musescorecomservice.cpp
@@ -28,6 +28,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QRandomGenerator>
+#include <QEventLoop>
 
 #include "clouderrors.h"
 
diff --git a/framework/extensions/qml/Muse/Extensions/CMakeLists.txt b/framework/extensions/qml/Muse/Extensions/CMakeLists.txt
index 5724c47061..0c8bee4562 100644
--- a/framework/extensions/qml/Muse/Extensions/CMakeLists.txt
+++ b/framework/extensions/qml/Muse/Extensions/CMakeLists.txt
@@ -19,6 +19,8 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 muse_create_qml_module(muse_extensions_qml ALIAS muse::extensions_qml FOR muse_extensions)
+target_link_libraries(muse_extensions_qml PRIVATE Qt::Quick)
+
 
 qt_add_qml_module(muse_extensions_qml
     URI Muse.Extensions
diff --git a/framework/global/CMakeLists.txt b/framework/global/CMakeLists.txt
index ebd5e9a810..62ae624e27 100644
--- a/framework/global/CMakeLists.txt
+++ b/framework/global/CMakeLists.txt
@@ -254,7 +254,7 @@ target_include_directories(muse_global PRIVATE ${_picojson}/picojson)
 if (MUSE_QT_SUPPORT)
     # These are needed by so many modules, that we make them public here,
     # so that other modules get them transitively.
-    target_link_libraries(muse_global PUBLIC Qt::Core Qt::Gui)
+    target_link_libraries(muse_global PUBLIC Qt::Core Qt::Gui Qt::Qml) # Qml: api/iapiengine.h exposes QJSValue
 
     target_link_libraries(muse_global PRIVATE Qt::Quick Qt::Widgets)
 endif()
diff --git a/framework/global/api/apiutils.h b/framework/global/api/apiutils.h
index 81492d9c3e..8eb5a4048f 100644
--- a/framework/global/api/apiutils.h
+++ b/framework/global/api/apiutils.h
@@ -26,6 +26,7 @@
 #include <vector>
 #include <QString>
 #include <QJSValue>
+#include <QMetaEnum>
 
 #include "apitypes.h"
 #include "iapiengine.h"
diff --git a/framework/global/io/internal/filesystem.h b/framework/global/io/internal/filesystem.h
index 59b78fa4ff..23ff2944b0 100644
--- a/framework/global/io/internal/filesystem.h
+++ b/framework/global/io/internal/filesystem.h
@@ -26,9 +26,9 @@
 #include <memory>
 #include <mutex>
 
-#include "../ifilesystem.h"
+#include <QFile>
 
-class QFile;
+#include "../ifilesystem.h"
 
 namespace muse::io {
 class FileSystem : public IFileSystem
diff --git a/framework/interactive/api/interactiveapi.cpp b/framework/interactive/api/interactiveapi.cpp
index 158d3cbdd4..f229a47109 100644
--- a/framework/interactive/api/interactiveapi.cpp
+++ b/framework/interactive/api/interactiveapi.cpp
@@ -23,6 +23,7 @@
 #include "interactiveapi.h"
 
 #include <QUrl>
+#include <QMetaEnum>
 
 using namespace muse::interactive;
 
diff --git a/framework/interactive/internal/iinteractiveprovider.h b/framework/interactive/internal/iinteractiveprovider.h
index 5e6ae7f8a4..1192adc380 100644
--- a/framework/interactive/internal/iinteractiveprovider.h
+++ b/framework/interactive/internal/iinteractiveprovider.h
@@ -28,6 +28,7 @@
 #include "global/async/channel.h"
 
 #include "global/modularity/imoduleinterface.h"
+#include <QWindow>
 
 namespace muse::interactive {
 class QmlLaunchData : public QObject
diff --git a/framework/interactive/internal/interactive.cpp b/framework/interactive/internal/interactive.cpp
index 5cc40f992c..be584319b5 100644
--- a/framework/interactive/internal/interactive.cpp
+++ b/framework/interactive/internal/interactive.cpp
@@ -31,6 +31,7 @@
 #include <QUrl>
 #include <QWidget>
 #include <QWindow>
+#include <QQmlEngine>
 
 #include "async/async.h"
 #include "io/path.h"
diff --git a/framework/interactive/qml/Muse/Interactive/interactiveprovidermodel.h b/framework/interactive/qml/Muse/Interactive/interactiveprovidermodel.h
index d9c3d90987..6e6610b670 100644
--- a/framework/interactive/qml/Muse/Interactive/interactiveprovidermodel.h
+++ b/framework/interactive/qml/Muse/Interactive/interactiveprovidermodel.h
@@ -30,6 +30,7 @@
 
 #include "modularity/ioc.h"
 #include "internal/iinteractiveprovider.h"
+#include <QWindow>
 
 namespace muse::interactive {
 struct QmlLaunchDataForeign {
diff --git a/framework/multiwindows/CMakeLists.txt b/framework/multiwindows/CMakeLists.txt
index bf72c37171..55fa564b51 100644
--- a/framework/multiwindows/CMakeLists.txt
+++ b/framework/multiwindows/CMakeLists.txt
@@ -20,6 +20,8 @@
 
 muse_create_module(muse_multiwindows ALIAS muse::multiwindows)
 
+target_link_libraries(muse_multiwindows PRIVATE Qt::Network)
+
 target_sources(muse_multiwindows PRIVATE
     multiwindowsmodule.cpp
     multiwindowsmodule.h
diff --git a/framework/multiwindows/internal/singleprocess/singleprocessprovider.cpp b/framework/multiwindows/internal/singleprocess/singleprocessprovider.cpp
index 45195b97f0..beae58910b 100644
--- a/framework/multiwindows/internal/singleprocess/singleprocessprovider.cpp
+++ b/framework/multiwindows/internal/singleprocess/singleprocessprovider.cpp
@@ -21,6 +21,7 @@
  */
 
  #include "singleprocessprovider.h"
+ #include <QCoreApplication>
 
  #include "../../iprojectprovider.h"
  #include "ui/imainwindow.h"
diff --git a/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.cpp b/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.cpp
index cac29cc579..e64a498538 100644
--- a/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.cpp
+++ b/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.cpp
@@ -20,6 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "multiinstancesdevmodel.h"
+#include <QVariant>
 
 using namespace muse::mi;
 
diff --git a/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.h b/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.h
index a7005d2a83..cf2a1b36c8 100644
--- a/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.h
+++ b/framework/multiwindows/qml/Muse/MultiWindows/multiinstancesdevmodel.h
@@ -29,6 +29,7 @@
 #include "internal/multiprocess/imultiprocessprovider.h"
 
 #include "async/asyncable.h"
+#include <QVariant>
 
 namespace muse::mi {
 class MultiInstancesDevModel : public QObject, public Contextable, public async::Asyncable
diff --git a/framework/rcontrol/CMakeLists.txt b/framework/rcontrol/CMakeLists.txt
index 7013316088..2f399691a4 100644
--- a/framework/rcontrol/CMakeLists.txt
+++ b/framework/rcontrol/CMakeLists.txt
@@ -18,6 +18,8 @@
 # NOTE This is the remote control module
 muse_create_module(muse_rcontrol ALIAS muse::rcontrol)
 
+target_link_libraries(muse_rcontrol PRIVATE Qt::Network)
+
 target_sources(muse_rcontrol PRIVATE
     rcontrolmodule.cpp
     rcontrolmodule.h
diff --git a/framework/tours/CMakeLists.txt b/framework/tours/CMakeLists.txt
index ad838a6d4b..212db5a98e 100644
--- a/framework/tours/CMakeLists.txt
+++ b/framework/tours/CMakeLists.txt
@@ -20,6 +20,8 @@
 
 muse_create_module(muse_tours ALIAS muse::tours)
 
+target_link_libraries(muse_tours PRIVATE Qt::Quick)
+
 target_sources(muse_tours PRIVATE
     toursmodule.cpp
     toursmodule.h
diff --git a/framework/tours/qml/Muse/Tours/CMakeLists.txt b/framework/tours/qml/Muse/Tours/CMakeLists.txt
index 928dbec93a..5516e708bf 100644
--- a/framework/tours/qml/Muse/Tours/CMakeLists.txt
+++ b/framework/tours/qml/Muse/Tours/CMakeLists.txt
@@ -19,6 +19,8 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 muse_create_qml_module(muse_tours_qml ALIAS muse::tours_qml FOR muse_tours)
+target_link_libraries(muse_tours_qml PRIVATE Qt::Quick)
+
 
 qt_add_qml_module(muse_tours_qml
     URI Muse.Tours
diff --git a/framework/ui/api/themeapi.cpp b/framework/ui/api/themeapi.cpp
index dff1f74395..b98ad3d707 100644
--- a/framework/ui/api/themeapi.cpp
+++ b/framework/ui/api/themeapi.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "themeapi.h"
+#include <QFontMetrics>
 
 using namespace muse::ui;
 using namespace muse::api;
diff --git a/framework/ui/qml/Muse/Ui/initialletternavigation.cpp b/framework/ui/qml/Muse/Ui/initialletternavigation.cpp
index de06350d7f..7734d641af 100644
--- a/framework/ui/qml/Muse/Ui/initialletternavigation.cpp
+++ b/framework/ui/qml/Muse/Ui/initialletternavigation.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "initialletternavigation.h"
+#include <QRegularExpression>
 
 #include "global/log.h"
 
diff --git a/framework/ui/qml/Muse/Ui/initialletternavigation.h b/framework/ui/qml/Muse/Ui/initialletternavigation.h
index d00edaef5e..5ad4ca7dc3 100644
--- a/framework/ui/qml/Muse/Ui/initialletternavigation.h
+++ b/framework/ui/qml/Muse/Ui/initialletternavigation.h
@@ -24,6 +24,7 @@
 
 #include <QObject>
 #include <qqmlintegration.h>
+#include <QTimer>
 
 #include "abstractnavigation.h"
 
diff --git a/framework/ui/view/qmldataformatter.cpp b/framework/ui/view/qmldataformatter.cpp
index 4eae5f519a..465fceedd9 100644
--- a/framework/ui/view/qmldataformatter.cpp
+++ b/framework/ui/view/qmldataformatter.cpp
@@ -20,6 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "qmldataformatter.h"
+#include <QLocale>
 
 #include "global/dataformatter.h"
 
diff --git a/framework/ui/view/widgetstyle.cpp b/framework/ui/view/widgetstyle.cpp
index e4e4f7848f..7b37514c81 100644
--- a/framework/ui/view/widgetstyle.cpp
+++ b/framework/ui/view/widgetstyle.cpp
@@ -34,6 +34,7 @@
 #include <QTextEdit>
 #include <QToolBar>
 #include <QVariant>
+#include <QPainter>
 
 #include "api/themeapi.h"
 #include "iconcodes.h"
diff --git a/framework/uicomponents/qml/Muse/UiComponents/CMakeLists.txt b/framework/uicomponents/qml/Muse/UiComponents/CMakeLists.txt
index d8bfbb3e07..31778c63b0 100644
--- a/framework/uicomponents/qml/Muse/UiComponents/CMakeLists.txt
+++ b/framework/uicomponents/qml/Muse/UiComponents/CMakeLists.txt
@@ -20,6 +20,8 @@
 
 muse_create_qml_module(muse_uicomponents_qml ALIAS muse::uicomponents_qml FOR muse_uicomponents)
 
+target_link_libraries(muse_uicomponents_qml PRIVATE Qt::Quick)
+
 qt_add_qml_module(muse_uicomponents_qml
     URI Muse.UiComponents
     VERSION 1.0
diff --git a/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp b/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp
index 4b7845d762..0741940d02 100644
--- a/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp
+++ b/framework/uicomponents/qml/Muse/UiComponents/abstracttableviewmodel.cpp
@@ -22,6 +22,8 @@
 #include "abstracttableviewmodel.h"
 
 #include <QSet>
+#include <QTime>
+#include <QTimer>
 
 #include "internal/tableviewlistcell.h"
 
diff --git a/framework/uicomponents/qml/Muse/UiComponents/filteredflyoutmodel.h b/framework/uicomponents/qml/Muse/UiComponents/filteredflyoutmodel.h
index c26f0fa12a..9aeca28858 100644
--- a/framework/uicomponents/qml/Muse/UiComponents/filteredflyoutmodel.h
+++ b/framework/uicomponents/qml/Muse/UiComponents/filteredflyoutmodel.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <QObject>
+#include <QVariant>
 #include <qqmlintegration.h>
 
 namespace muse::uicomponents {
diff --git a/framework/uicomponents/qml/Muse/UiComponents/polylineplot.cpp b/framework/uicomponents/qml/Muse/UiComponents/polylineplot.cpp
index 2847f80ed8..f1f693a1af 100644
--- a/framework/uicomponents/qml/Muse/UiComponents/polylineplot.cpp
+++ b/framework/uicomponents/qml/Muse/UiComponents/polylineplot.cpp
@@ -23,6 +23,7 @@
 #include "polylineplot.h"
 #include "realfn.h"
 
+#include <QCursor>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPen>
diff --git a/framework/update/CMakeLists.txt b/framework/update/CMakeLists.txt
index d2369b024b..26f23b56fe 100644
--- a/framework/update/CMakeLists.txt
+++ b/framework/update/CMakeLists.txt
@@ -20,6 +20,8 @@
 
 muse_create_module(muse_update ALIAS muse::update)
 
+target_link_libraries(muse_update PRIVATE Qt::Network)
+
 target_sources(muse_update PRIVATE
     updatemodule.cpp
     updatemodule.h