diff --git a/buildscripts/cmake/DeclareModuleSetup.cmake b/buildscripts/cmake/DeclareModuleSetup.cmake
index 85591013563fa..d1d78131dbe5b 100644
--- a/buildscripts/cmake/DeclareModuleSetup.cmake
+++ b/buildscripts/cmake/DeclareModuleSetup.cmake
@@ -55,6 +55,7 @@ macro(declare_module name)
     unset(MODULE_SRC)
     unset(MODULE_LINK)
     set(MODULE_LINK_GLOBAL ON)
+    set(MODULE_USE_QT ON)
     unset(MODULE_QRC)
     unset(MODULE_BIG_QRC)
     unset(MODULE_UI)
@@ -67,15 +68,23 @@ macro(declare_module name)
     set(MODULE_USE_COVERAGE ON)
 endmacro()
 
+macro(declare_thirdparty_module name)
+    declare_module(${name})
+    set(MODULE_USE_QT OFF)
+    set(MODULE_LINK_GLOBAL OFF)
+    set(MODULE_USE_PCH OFF)
+    set(MODULE_USE_COVERAGE OFF)
+endmacro()
+
 
 macro(add_qml_import_path input_var)
-  if (NOT ${${input_var}} STREQUAL "")
-      set(QML_IMPORT_PATH "$CACHE{QML_IMPORT_PATH}")
-      list(APPEND QML_IMPORT_PATH ${${input_var}})
-      list(REMOVE_DUPLICATES QML_IMPORT_PATH)
-      set(QML_IMPORT_PATH "${QML_IMPORT_PATH}" CACHE STRING
-          "QtCreator extra import paths for QML modules" FORCE)
-  endif()
+    if (NOT ${${input_var}} STREQUAL "")
+        set(QML_IMPORT_PATH "$CACHE{QML_IMPORT_PATH}")
+        list(APPEND QML_IMPORT_PATH ${${input_var}})
+        list(REMOVE_DUPLICATES QML_IMPORT_PATH)
+        set(QML_IMPORT_PATH "${QML_IMPORT_PATH}" CACHE STRING
+            "QtCreator extra import paths for QML modules" FORCE)
+    endif()
 endmacro()
 
 
@@ -87,26 +96,6 @@ macro(setup_module)
         message(STATUS "Configuring ${MODULE} <${MODULE_ALIAS}>")
     endif()
 
-    if (NOT MUSE_FRAMEWORK_PATH)
-        set(MUSE_FRAMEWORK_PATH ${PROJECT_SOURCE_DIR})
-    endif()
-
-    if (MODULE_QRC AND NOT NO_QT_SUPPORT)
-        qt_add_resources(RCC_SOURCES ${MODULE_QRC})
-    endif()
-
-    if (MODULE_BIG_QRC AND NOT NO_QT_SUPPORT)
-        qt_add_big_resources(RCC_BIG_SOURCES ${MODULE_BIG_QRC})
-    endif()
-
-    if (MODULE_UI)
-        find_package(Qt6Widgets)
-        QT6_WRAP_UI(ui_headers ${MODULE_UI} )
-    endif()
-
-    add_qml_import_path(MODULE_QML_IMPORT)
-    add_qml_import_path(MODULE_QMLAPI_IMPORT)
-
     if (CC_IS_EMSCRIPTEN)
         add_library(${MODULE} OBJECT)
     else()
@@ -117,10 +106,36 @@ macro(setup_module)
         add_library(${MODULE_ALIAS} ALIAS ${MODULE})
     endif()
 
+    if (MODULE_USE_QT AND QT_SUPPORT)
+        if (MODULE_QRC AND NOT NO_QT_SUPPORT)
+            qt_add_resources(RCC_SOURCES ${MODULE_QRC})
+        endif()
+
+        if (MODULE_BIG_QRC AND NOT NO_QT_SUPPORT)
+            qt_add_big_resources(RCC_BIG_SOURCES ${MODULE_BIG_QRC})
+        endif()
+    else()
+        set(RCC_SOURCES)
+        set(RCC_BIG_SOURCES)
+
+        set_target_properties(${MODULE} PROPERTIES
+            AUTOMOC OFF
+            AUTOUIC OFF
+            AUTORCC OFF
+        )
+    endif()
+
+    add_qml_import_path(MODULE_QML_IMPORT)
+    add_qml_import_path(MODULE_QMLAPI_IMPORT)
+
     if (BUILD_SHARED_LIBS)
         install(TARGETS ${MODULE} DESTINATION ${SHARED_LIBS_INSTALL_DESTINATION})
     endif()
 
+    if (NOT MUSE_FRAMEWORK_PATH)
+        set(MUSE_FRAMEWORK_PATH ${PROJECT_SOURCE_DIR})
+    endif()
+
     if (MUSE_COMPILE_USE_PCH AND MODULE_USE_PCH)
         if (${MODULE} STREQUAL muse_global)
             target_precompile_headers(${MODULE} PRIVATE ${MUSE_FRAMEWORK_PATH}/buildscripts/pch/pch.h)
@@ -149,7 +164,7 @@ macro(setup_module)
         ${RCC_SOURCES}
         ${RCC_BIG_SOURCES}
         ${MODULE_SRC}
-        )
+    )
 
     target_include_directories(${MODULE} PUBLIC
         ${PROJECT_BINARY_DIR}
@@ -188,11 +203,10 @@ macro(setup_module)
     endif()
 
     if (NOT ${MODULE} MATCHES muse_global AND MODULE_LINK_GLOBAL)
-        set(MODULE_LINK muse_global ${MODULE_LINK})
+        target_link_libraries(${MODULE} PRIVATE muse_global)
     endif()
 
-    set(MODULE_LINK ${CMAKE_DL_LIBS} ${QT_LIBRARIES} ${MODULE_LINK})
-
-    target_link_libraries(${MODULE} PRIVATE ${MODULE_LINK} ${COVERAGE_FLAGS})
-
+    target_link_libraries(${MODULE}
+        PRIVATE ${MODULE_LINK} ${CMAKE_DL_LIBS} ${QT_LIBRARIES} ${COVERAGE_FLAGS}
+    )
 endmacro()
diff --git a/buildscripts/cmake/SetupSndFile.cmake b/buildscripts/cmake/SetupSndFile.cmake
index 9245e8ae289e4..1b9a2d592b518 100644
--- a/buildscripts/cmake/SetupSndFile.cmake
+++ b/buildscripts/cmake/SetupSndFile.cmake
@@ -14,7 +14,7 @@ elseif (OS_IS_WASM)
     set(LIBVORBIS_PATH "" CACHE PATH "Path to libogg sources")
     set(SNDFILE_INCDIR LIBSND_PATH)
 
-    declare_module(sndfile)
+    declare_thirdparty_module(sndfile)
 
     set(MODULE_SRC
         ${LIBSND_PATH}/sndfile.c
diff --git a/buildscripts/packaging/macOS/package.sh b/buildscripts/packaging/macOS/package.sh
index 55c0c235482bb..9ad1912a5b16e 100755
--- a/buildscripts/packaging/macOS/package.sh
+++ b/buildscripts/packaging/macOS/package.sh
@@ -124,7 +124,7 @@ find "${VOLUME}/${LONGER_NAME}.app/Contents/Resources" -name '*.dylib' -exec cod
 # Sign code in other (more conventional) locations
 codesign --force --options runtime --entitlements "${WORKING_DIRECTORY}/../buildscripts/packaging/macOS/entitlements.plist" --deep -s "Developer ID Application: MuseScore" "${VOLUME}/${LONGER_NAME}.app"
 echo "spctl"
-spctl --assess --type execute "${VOLUME}/${LONGER_NAME}.app"
+spctl --assess --type execute -vvv "${VOLUME}/${LONGER_NAME}.app"
 echo "Codesign verify"
 codesign --verify --deep --strict --verbose=2 "${VOLUME}/${LONGER_NAME}.app"
 
diff --git a/src/braille/thirdparty/liblouis/CMakeLists.txt b/src/braille/thirdparty/liblouis/CMakeLists.txt
index e57fe75257c48..9dd5b06c872f4 100644
--- a/src/braille/thirdparty/liblouis/CMakeLists.txt
+++ b/src/braille/thirdparty/liblouis/CMakeLists.txt
@@ -1,4 +1,4 @@
-declare_module(liblouis)
+declare_thirdparty_module(liblouis)
 
 add_subdirectory(tables)
 
@@ -36,7 +36,6 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/liblouis/utils.c
 )
 
-set(MODULE_USE_PCH OFF)
 set(MODULE_USE_UNITY OFF)
 set(MODULE_USE_COVERAGE OFF)
 
diff --git a/src/engraving/compat/midi/midipatch.h b/src/engraving/compat/midi/midipatch.h
index 80f14cf7fa057..b52bbd558d23f 100644
--- a/src/engraving/compat/midi/midipatch.h
+++ b/src/engraving/compat/midi/midipatch.h
@@ -32,9 +32,9 @@ namespace mu::engraving {
 
 struct MidiPatch {
     bool drum;
-    String synti;
+    muse::String synti;
     int bank, prog, sfid;
-    String name;
+    muse::String name;
 };
 }
 #endif
diff --git a/src/engraving/dom/actionicon.cpp b/src/engraving/dom/actionicon.cpp
index dc736fb3b5ded..30ec8d5d10401 100644
--- a/src/engraving/dom/actionicon.cpp
+++ b/src/engraving/dom/actionicon.cpp
@@ -23,9 +23,6 @@
 #include "actionicon.h"
 
 #include "property.h"
-#include "score.h"
-
-#include "log.h"
 
 using namespace mu;
 using namespace muse::draw;
diff --git a/src/engraving/dom/drumset.h b/src/engraving/dom/drumset.h
index dc8fb01d43a67..d1ceae84d0ec5 100644
--- a/src/engraving/dom/drumset.h
+++ b/src/engraving/dom/drumset.h
@@ -23,7 +23,6 @@
 #ifndef MU_ENGRAVING_DRUMSET_H
 #define MU_ENGRAVING_DRUMSET_H
 
-#include "mscore.h"
 #include "pitchspelling.h"
 #include "../types/types.h"
 
diff --git a/src/engraving/dom/edit.cpp b/src/engraving/dom/edit.cpp
index ce23219f5d88e..ff09f9cd85ba2 100644
--- a/src/engraving/dom/edit.cpp
+++ b/src/engraving/dom/edit.cpp
@@ -81,13 +81,13 @@
 #include "system.h"
 #include "systemtext.h"
 #include "tempotext.h"
+#include "text.h"
 #include "textline.h"
 #include "tie.h"
 #include "tiemap.h"
 #include "timesig.h"
-
-#include "tremolotwochord.h"
 #include "tremolosinglechord.h"
+#include "tremolotwochord.h"
 #include "trill.h"
 #include "tuplet.h"
 #include "tupletmap.h"
diff --git a/src/engraving/dom/lyrics.cpp b/src/engraving/dom/lyrics.cpp
index 96f74f5e42d29..eed07b842b20d 100644
--- a/src/engraving/dom/lyrics.cpp
+++ b/src/engraving/dom/lyrics.cpp
@@ -30,6 +30,7 @@
 #include "segment.h"
 #include "staff.h"
 #include "system.h"
+#include "text.h"
 #include "textedit.h"
 #include "undo.h"
 #include "utils.h"
diff --git a/src/engraving/dom/undo.cpp b/src/engraving/dom/undo.cpp
index 7af1d4d2af31e..f44c98246976e 100644
--- a/src/engraving/dom/undo.cpp
+++ b/src/engraving/dom/undo.cpp
@@ -41,7 +41,6 @@
 #include "bracket.h"
 #include "chord.h"
 #include "clef.h"
-#include "capo.h"
 #include "engravingitem.h"
 #include "excerpt.h"
 #include "fret.h"
@@ -59,12 +58,9 @@
 #include "noteevent.h"
 #include "page.h"
 #include "part.h"
-#include "partialtie.h"
-#include "rest.h"
 #include "score.h"
 #include "segment.h"
 #include "select.h"
-#include "sig.h"
 #include "spanner.h"
 #include "staff.h"
 #include "stafflines.h"
@@ -76,7 +72,6 @@
 #include "textline.h"
 #include "tie.h"
 
-#include "tremolobar.h"
 #include "tuplet.h"
 #include "utils.h"
 
diff --git a/src/engraving/dom/undo.h b/src/engraving/dom/undo.h
index a97ab3803a1cf..284bb25e34fa3 100644
--- a/src/engraving/dom/undo.h
+++ b/src/engraving/dom/undo.h
@@ -29,9 +29,6 @@
 
 #include <map>
 
-#include "modularity/ioc.h"
-#include "../iengravingfontsprovider.h"
-
 #include "../style/style.h"
 #include "../compat/midi/midipatch.h"
 
@@ -59,12 +56,9 @@
 #include "stafftype.h"
 #include "stringdata.h"
 #include "stringtunings.h"
-#include "synthesizerstate.h"
 #include "soundflag.h"
-#include "text.h"
 
 #include "tremolotwochord.h"
-#include "tremolobar.h"
 
 namespace mu::engraving {
 class Bend;
diff --git a/src/engraving/tests/links_tests.cpp b/src/engraving/tests/links_tests.cpp
index c28ba11ff1c2d..60307c452e6c5 100644
--- a/src/engraving/tests/links_tests.cpp
+++ b/src/engraving/tests/links_tests.cpp
@@ -31,9 +31,9 @@
 #include "dom/part.h"
 #include "dom/segment.h"
 #include "dom/tempotext.h"
+#include "dom/text.h"
 #include "dom/undo.h"
 #include "utils/scorerw.h"
-#include "utils/scorecomp.h"
 
 using namespace mu;
 using namespace mu::engraving;
diff --git a/src/framework/audio/internal/platform/osx/osxaudiodriver.mm b/src/framework/audio/internal/platform/osx/osxaudiodriver.mm
index 2477e63ede2bd..25ebc51bb75ce 100644
--- a/src/framework/audio/internal/platform/osx/osxaudiodriver.mm
+++ b/src/framework/audio/internal/platform/osx/osxaudiodriver.mm
@@ -33,7 +33,6 @@
 
 using namespace muse;
 using namespace muse::audio;
-static constexpr char DEFAULT_DEVICE_ID[] = "Systems default";
 
 struct OSXAudioDriver::Data {
     Spec format;
diff --git a/src/framework/audio/thirdparty/flac/CMakeLists.txt b/src/framework/audio/thirdparty/flac/CMakeLists.txt
index 86912232f2cf2..54498b690d87a 100644
--- a/src/framework/audio/thirdparty/flac/CMakeLists.txt
+++ b/src/framework/audio/thirdparty/flac/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-declare_module(flac)
+declare_thirdparty_module(flac)
 
 include(GetPlatformInfo)
 include(GetCompilerInfo)
@@ -68,7 +67,6 @@ set (MODULE_SRC
     $<$<BOOL:${OS_IS_WIN}>:${FLAC_SRC}/share/win_utf8_io/win_utf8_io.c>
     )
 
-set(MODULE_USE_PCH OFF)
 set(MODULE_USE_UNITY OFF)
 set(MODULE_USE_COVERAGE OFF)
 
diff --git a/src/framework/audio/thirdparty/fluidsynth/CMakeLists.txt b/src/framework/audio/thirdparty/fluidsynth/CMakeLists.txt
index 43633cd860c23..11803f1a89731 100644
--- a/src/framework/audio/thirdparty/fluidsynth/CMakeLists.txt
+++ b/src/framework/audio/thirdparty/fluidsynth/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-declare_module(fluidsynth)
+declare_thirdparty_module(fluidsynth)
 
 include(${CMAKE_CURRENT_LIST_DIR}/fluidsynth.cmake)
 
@@ -23,7 +22,6 @@ set(MODULE_LINK
     ${SNDFILE_LIB}
     )
 
-set(MODULE_USE_PCH OFF)
 set(MODULE_USE_UNITY OFF)
 set(MODULE_USE_COVERAGE OFF)
 
diff --git a/src/framework/audio/thirdparty/lame/CMakeLists.txt b/src/framework/audio/thirdparty/lame/CMakeLists.txt
index 27599dcf67fca..931222dbb4bf5 100644
--- a/src/framework/audio/thirdparty/lame/CMakeLists.txt
+++ b/src/framework/audio/thirdparty/lame/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-declare_module(lame)
+declare_thirdparty_module(lame)
 
 include(GetPlatformInfo)
 include(GetCompilerInfo)
@@ -56,7 +55,6 @@ set (MODULE_SRC
     ${SOURCE_LIB}
     )
 
-set(MODULE_USE_PCH OFF)
 set(MODULE_USE_UNITY OFF)
 set(MODULE_USE_COVERAGE OFF)
 
diff --git a/src/framework/audio/thirdparty/opusenc/CMakeLists.txt b/src/framework/audio/thirdparty/opusenc/CMakeLists.txt
index 5949633e2df05..d21c631d2bb85 100644
--- a/src/framework/audio/thirdparty/opusenc/CMakeLists.txt
+++ b/src/framework/audio/thirdparty/opusenc/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-declare_module(opusenc)
+declare_thirdparty_module(opusenc)
 
 include(GetPlatformInfo)
 include(GetCompilerInfo)
@@ -32,7 +31,6 @@ set(MODULE_SRC
 
 set(MODULE_LINK ${OPUS_LIBRARIES})
 
-set(MODULE_USE_PCH OFF)
 set(MODULE_USE_UNITY OFF)
 set(MODULE_USE_COVERAGE OFF)
 
diff --git a/src/framework/audio/thirdparty/opusenc/cmake/SetupOpus.cmake b/src/framework/audio/thirdparty/opusenc/cmake/SetupOpus.cmake
index 2b287d94c665d..495fcc749bcd4 100644
--- a/src/framework/audio/thirdparty/opusenc/cmake/SetupOpus.cmake
+++ b/src/framework/audio/thirdparty/opusenc/cmake/SetupOpus.cmake
@@ -49,6 +49,12 @@ endif()
 set(OPUS_INCLUDE_DIRS ${OPUS_LIB_DIR}/include)
 set(OPUS_LIBRARIES opus)
 
+set_target_properties(opus PROPERTIES
+    AUTOMOC OFF
+    AUTOUIC OFF
+    AUTORCC OFF
+)
+
 target_no_warning(opus -Wno-conversion)
 target_no_warning(opus -Wno-truncate)
 target_no_warning(opus -Wno-uninitialized)
diff --git a/src/framework/draw/thirdparty/freetype/CMakeLists.txt b/src/framework/draw/thirdparty/freetype/CMakeLists.txt
index ba264671e4ac2..a1e6eff0ecb21 100644
--- a/src/framework/draw/thirdparty/freetype/CMakeLists.txt
+++ b/src/framework/draw/thirdparty/freetype/CMakeLists.txt
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-declare_module(freetype)
+declare_thirdparty_module(freetype)
 
 set(FREETYPE_DIR ${CMAKE_CURRENT_LIST_DIR}/freetype-2.13.1)
 set(FREETYPE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/freetype-2.13.1)
@@ -160,7 +160,6 @@ set(MODULE_DEF
     -DFT2_BUILD_LIBRARY
 )
 
-set(MODULE_USE_PCH OFF)
 set(MODULE_USE_UNITY OFF)
 set(MODULE_USE_COVERAGE OFF)
 
diff --git a/src/framework/uicomponents/view/abstractmenumodel.h b/src/framework/uicomponents/view/abstractmenumodel.h
index dc81df29d4653..8a09b2c6a0c79 100644
--- a/src/framework/uicomponents/view/abstractmenumodel.h
+++ b/src/framework/uicomponents/view/abstractmenumodel.h
@@ -19,13 +19,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MUSE_UICOMPONENTS_ABSTRACTMENUMODEL_H
-#define MUSE_UICOMPONENTS_ABSTRACTMENUMODEL_H
+#pragma once
 
 #include <QAbstractListModel>
 
 #include "async/asyncable.h"
-#include "ui/uitypes.h"
 #include "menuitem.h"
 
 #include "modularity/ioc.h"
@@ -106,5 +104,3 @@ class AbstractMenuModel : public QAbstractListModel, public muse::Injectable, pu
     MenuItemList m_items;
 };
 }
-
-#endif // MUSE_UICOMPONENTS_ABSTRACTMENUMODEL_H
diff --git a/src/framework/vst/sdk/CMakeLists.txt b/src/framework/vst/sdk/CMakeLists.txt
index 5894999596eac..31fa1854c1e0e 100644
--- a/src/framework/vst/sdk/CMakeLists.txt
+++ b/src/framework/vst/sdk/CMakeLists.txt
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-declare_module(vst_sdk_3)
+declare_thirdparty_module(vst_sdk_3)
 
 if (NOT MUSE_MODULE_VST_VST3_SDK_PATH)
     message(FATAL_ERROR "VST3_SDK path is not setted")
@@ -37,8 +37,6 @@ else()
 endif()
 
 set(MODULE_USE_UNITY OFF)
-set(MODULE_USE_PCH OFF)
-set(MODULE_USE_COVERAGE OFF)
 
 if (OS_IS_WIN)
     set(PLATFORM_SRC
diff --git a/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp b/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp
index e04440d915c42..62e062fd03505 100644
--- a/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp
+++ b/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp
@@ -9007,17 +9007,17 @@ void ExportMusicXml::harmony(Harmony const* const h, FretDiagram const* const fd
                     alter = 1;
                 }
                 const String numberStr = matches.at(1);
-                size_t harmoy = 1;
+                size_t harmony = 1;
                 if (numberStr.contains(u"v", CaseSensitivity::CaseInsensitive)) {
                     if (numberStr.startsWith(u"i", CaseSensitivity::CaseInsensitive)) {
-                        harmoy = 4;
+                        harmony = 4;
                     } else {
-                        harmoy = 4 + numberStr.size();
+                        harmony = 4 + numberStr.size();
                     }
                 } else {
-                    harmoy = numberStr.size();
+                    harmony = numberStr.size();
                 }
-                m_xml.tag("numeral-root", { { "text", numberStr } }, harmoy);
+                m_xml.tag("numeral-root", { { "text", numberStr } }, harmony);
                 if (alter) {
                     m_xml.tag("numeral-alter", alter);
                 }
diff --git a/src/notation/imasternotation.h b/src/notation/imasternotation.h
index 06694f1a508b4..7ddd3c3f967cb 100644
--- a/src/notation/imasternotation.h
+++ b/src/notation/imasternotation.h
@@ -22,7 +22,8 @@
 #ifndef MU_NOTATION_IMASTERNOTATION_H
 #define MU_NOTATION_IMASTERNOTATION_H
 
-#include "types/retval.h"
+#include "async/notification.h"
+#include "types/ret.h"
 
 #include "inotation.h"
 #include "iexcerptnotation.h"
diff --git a/src/notation/inotation.h b/src/notation/inotation.h
index 3586926430b00..ba5554d19e4ed 100644
--- a/src/notation/inotation.h
+++ b/src/notation/inotation.h
@@ -31,7 +31,6 @@
 #include "inotationviewstate.h"
 #include "inotationsolomutestate.h"
 #include "inotationstyle.h"
-#include "inotationplayback.h"
 #include "inotationelements.h"
 #include "inotationinteraction.h"
 #include "inotationaccessibility.h"
diff --git a/src/notation/internal/notationconfiguration.h b/src/notation/internal/notationconfiguration.h
index 8181e150665c2..dab4f16f858cd 100644
--- a/src/notation/internal/notationconfiguration.h
+++ b/src/notation/internal/notationconfiguration.h
@@ -19,8 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MU_NOTATION_NOTATIONCONFIGURATION_H
-#define MU_NOTATION_NOTATIONCONFIGURATION_H
+#pragma once
 
 #include "async/asyncable.h"
 
@@ -271,5 +270,3 @@ class NotationConfiguration : public INotationConfiguration, public muse::async:
     int m_styleDialogLastSubPageIndex = 0;
 };
 }
-
-#endif // MU_NOTATION_NOTATIONCONFIGURATION_H
diff --git a/src/playback/iplaybackconfiguration.h b/src/playback/iplaybackconfiguration.h
index e58fec07a4b8b..8c5e49654ae73 100644
--- a/src/playback/iplaybackconfiguration.h
+++ b/src/playback/iplaybackconfiguration.h
@@ -19,11 +19,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MU_PLAYBACK_IPLAYBACKCONFIGURATION_H
-#define MU_PLAYBACK_IPLAYBACKCONFIGURATION_H
+#pragma once
 
+#include "async/channel.h"
+#include "async/notification.h"
 #include "modularity/imoduleinterface.h"
-#include "types/retval.h"
 #include "playbacktypes.h"
 
 namespace mu::playback {
@@ -85,5 +85,3 @@ class IPlaybackConfiguration : MODULE_EXPORT_INTERFACE
     virtual bool shouldMeasureInputLag() const = 0;
 };
 }
-
-#endif // MU_PLAYBACK_IPLAYBACKCONFIGURATION_H
diff --git a/src/playback/view/internal/auxsenditem.cpp b/src/playback/view/internal/auxsenditem.cpp
index 655bcf83b17cf..d45fc2148f9ec 100644
--- a/src/playback/view/internal/auxsenditem.cpp
+++ b/src/playback/view/internal/auxsenditem.cpp
@@ -22,8 +22,6 @@
 
 #include "auxsenditem.h"
 
-#include "realfn.h"
-
 using namespace mu::playback;
 
 AuxSendItem::AuxSendItem(QObject* parent)
diff --git a/src/playback/view/internal/auxsenditem.h b/src/playback/view/internal/auxsenditem.h
index 30c7e737801ee..221225fb5368d 100644
--- a/src/playback/view/internal/auxsenditem.h
+++ b/src/playback/view/internal/auxsenditem.h
@@ -25,8 +25,6 @@
 
 #include <QObject>
 
-#include "audio/audiotypes.h"
-
 namespace mu::playback {
 class AuxSendItem : public QObject
 {
diff --git a/src/project/view/scorespagemodel.cpp b/src/project/view/scorespagemodel.cpp
index 3fc10747c0e21..de731653896b8 100644
--- a/src/project/view/scorespagemodel.cpp
+++ b/src/project/view/scorespagemodel.cpp
@@ -26,8 +26,6 @@
 
 #include "actions/actiontypes.h"
 
-#include "types/projecttypes.h"
-
 using namespace mu::project;
 using namespace muse::actions;
 
diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
index 3b80c995aa06a..0cecf577f0675 100644
--- a/thirdparty/beatroot/CMakeLists.txt
+++ b/thirdparty/beatroot/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-declare_module(beatroot)
+declare_thirdparty_module(beatroot)
 
 set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/Agent.cpp
diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
index 2f32eda0288bd..087893c4148ea 100644
--- a/thirdparty/rtf2html/CMakeLists.txt
+++ b/thirdparty/rtf2html/CMakeLists.txt
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>. 
 
-declare_module(rtf2html)
+declare_thirdparty_module(rtf2html)
 
 set(MODULE_SRC
     common.h