diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1132a9e68..ffabc0b037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
     Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
     Feature #6199: Support FBO Rendering
     Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
+    Task #6201: Remove the "Note: No relevant classes found. No output generated" warnings
     Task #6264: Remove the old classes in animation.cpp
 
 0.47.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a824d4e9..d14762ef5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,8 +202,6 @@ if (USE_QT)
     find_package(Qt5Widgets REQUIRED)
     find_package(Qt5Network REQUIRED)
     find_package(Qt5OpenGL REQUIRED)
-    # Instruct CMake to run moc automatically when needed.
-    #set(CMAKE_AUTOMOC ON)
 endif()
 
 set(USED_OSG_COMPONENTS
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index e9ec906e6a..7e8bd67e94 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -36,23 +36,6 @@ set(LAUNCHER_HEADER
 )
 
 # Headers that must be pre-processed
-set(LAUNCHER_HEADER_MOC
-    datafilespage.hpp
-    graphicspage.hpp
-    maindialog.hpp
-    playpage.hpp
-    textslotmsgbox.hpp
-    settingspage.hpp
-    advancedpage.hpp
-
-    utils/cellnameloader.hpp
-    utils/textinputdialog.hpp
-    utils/profilescombobox.hpp
-    utils/lineedit.hpp
-    utils/openalutil.hpp
-
-)
-
 set(LAUNCHER_UI
     ${CMAKE_SOURCE_DIR}/files/ui/datafilespage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/graphicspage.ui
@@ -74,7 +57,6 @@ if(WIN32)
 endif(WIN32)
 
 QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
-QT5_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC})
 QT5_WRAP_UI(UI_HDRS ${LAUNCHER_UI})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -109,4 +91,7 @@ if (BUILD_WITH_CODE_COVERAGE)
   target_link_libraries(openmw-launcher gcov)
 endif()
 
+if(USE_QT)
+    set_property(TARGET openmw-launcher PROPERTY AUTOMOC ON)
+endif(USE_QT)
 
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 4b3b8030e6..60bd0f4ded 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -150,7 +150,6 @@ if(WIN32)
 endif(WIN32)
 
 qt5_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
-qt5_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
 qt5_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
 
 # for compiled .ui files
@@ -259,3 +258,7 @@ endif (MSVC)
 if(APPLE)
     INSTALL(TARGETS openmw-cs BUNDLE DESTINATION "." COMPONENT Bundle)
 endif()
+
+if(USE_QT)
+    set_property(TARGET openmw-cs PROPERTY AUTOMOC ON)
+endif(USE_QT)
diff --git a/apps/opencs/view/tools/merge.hpp b/apps/opencs/view/tools/merge.hpp
index d394a431ed..c7c4585979 100644
--- a/apps/opencs/view/tools/merge.hpp
+++ b/apps/opencs/view/tools/merge.hpp
@@ -1,5 +1,5 @@
-#ifndef CSV_TOOLS_REPORTTABLE_H
-#define CSV_TOOLS_REPORTTABLE_H
+#ifndef CSV_TOOLS_MERGE_H
+#define CSV_TOOLS_MERGE_H
 
 #include <QWidget>
 
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 2558ec81de..03cd63480a 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set(WIZARD
     componentselectionpage.cpp
     conclusionpage.cpp
@@ -34,21 +33,6 @@ set(WIZARD_HEADER
     utils/componentlistwidget.hpp
 )
 
-# Headers that must be pre-processed
-set(WIZARD_HEADER_MOC
-    componentselectionpage.hpp
-    conclusionpage.hpp
-    existinginstallationpage.hpp
-    importpage.hpp
-    installationtargetpage.hpp
-    intropage.hpp
-    languageselectionpage.hpp
-    mainwizard.hpp
-    methodselectionpage.hpp
-
-    utils/componentlistwidget.hpp
-)
-
 set(WIZARD_UI
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/componentselectionpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/conclusionpage.ui
@@ -63,7 +47,6 @@ set(WIZARD_UI
 if (OPENMW_USE_UNSHIELD)
     set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp)
     set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp)
-    set (WIZARD_HEADER_MOC ${WIZARD_HEADER_MOC} installationpage.hpp unshield/unshieldworker.hpp)
     set (WIZARD_UI ${WIZARD_UI} ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationpage.ui)
     add_definitions(-DOPENMW_USE_UNSHIELD)
 endif (OPENMW_USE_UNSHIELD)
@@ -80,7 +63,6 @@ if(WIN32)
 endif(WIN32)
 
 QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/wizard/wizard.qrc)
-QT5_WRAP_CPP(MOC_SRCS ${WIZARD_HEADER_MOC})
 QT5_WRAP_UI(UI_HDRS ${WIZARD_UI})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -94,7 +76,6 @@ openmw_add_executable(openmw-wizard
     ${WIZARD}
     ${WIZARD_HEADER}
     ${RCC_SRCS}
-    ${MOC_SRCS}
     ${UI_HDRS}
 )
 
@@ -125,3 +106,7 @@ endif()
 if (WIN32)
     INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION ".")
 endif(WIN32)
+
+if(USE_QT)
+    set_property(TARGET openmw-wizard PROPERTY AUTOMOC ON)
+endif(USE_QT)
diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake
index 176a02d507..5bee345344 100644
--- a/cmake/OpenMWMacros.cmake
+++ b/cmake/OpenMWMacros.cmake
@@ -80,10 +80,6 @@ foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND COMPONENT_QT_FILES "${f}")
 endforeach (f)
-file (GLOB MOC_H "${dir}/${u}.hpp")
-foreach (fi ${MOC_H})
-list (APPEND COMPONENT_MOC_FILES "${fi}")
-endforeach (fi)
 endforeach (u)
 source_group ("components\\${dir}" FILES ${files})
 endmacro (add_component_qt_dir)
@@ -99,7 +95,6 @@ endmacro (add_unit)
 
 macro (add_qt_unit project dir unit)
 add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
-add_file (${project} _HDR_QT ${comp} "${dir}/${unit}.hpp")
 add_file (${project} _SRC ${comp} "${dir}/${unit}.cpp")
 endmacro (add_qt_unit)
 
@@ -109,7 +104,6 @@ endmacro (add_hdr)
 
 macro (add_qt_hdr project dir unit)
 add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
-add_file (${project} _HDR_QT ${comp} "${dir}/${unit}.hpp")
 endmacro (add_qt_hdr)
 
 macro (opencs_units dir)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 7983de6190..5b79a096cd 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -226,7 +226,6 @@ if (USE_QT)
         )
 
     QT5_WRAP_UI(ESM_UI_HDR ${ESM_UI})
-    QT5_WRAP_CPP(MOC_SRCS ${COMPONENT_MOC_FILES})
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -280,7 +279,7 @@ if (WIN32)
 endif()
 
 if (USE_QT)
-    add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
+    add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${ESM_UI_HDR})
     target_link_libraries(components_qt components Qt5::Widgets Qt5::Core)
     target_compile_definitions(components_qt PRIVATE OPENMW_DOC_BASEURL="${OPENMW_DOC_BASEURL}")
 endif()
@@ -333,3 +332,7 @@ if(OSG_STATIC)
         target_link_libraries(components freetype jpeg png)
     endif()
 endif(OSG_STATIC)
+
+if(USE_QT)
+    set_property(TARGET components_qt PROPERTY AUTOMOC ON)
+endif(USE_QT)