Remove unused includes

src/app.cpp

@@ -8,7 +8,9 @@
 
 #include "leakdetector.h"
 #include "logger.h"
-#include "settings/settingsmanager.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 2, 4)
+#  include "settings/settingsmanager.h"
+#endif
 #include "settingsholder.h"
 #include "taskscheduler.h"
 

src/apppermission.cpp

@@ -12,7 +12,6 @@
 #include "i18nstrings.h"
 #include "leakdetector.h"
 #include "logger.h"
-#include "mozillavpn.h"
 #include "platforms/dummy/dummyapplistprovider.h"
 #include "settingsholder.h"
 

src/collator.cpp

@@ -4,7 +4,9 @@
 
 #include "collator.h"
 
-#include "localizer.h"
+#if defined(MZ_WASM)
+#  include "localizer.h"
+#endif
 
 #ifdef MZ_IOS
 #  include "platforms/ios/ioscommons.h"

src/commands/commandui.cpp

@@ -13,44 +13,26 @@
 #include "accessiblenotification.h"
 #include "addons/manager/addonmanager.h"
 #include "apppermission.h"
-#include "captiveportal/captiveportaldetection.h"
 #include "commandlineparser.h"
-#include "connectionhealth.h"
 #include "constants.h"
 #include "controller.h"
 #include "daemon/mock/mockdaemon.h"
-#include "feature/feature.h"
 #include "fontloader.h"
-#include "glean/generated/metrics.h"
 #include "glean/generated/pings.h"
 #include "glean/mzglean.h"
 #include "i18nstrings.h"
 #include "imageproviderfactory.h"
 #include "inspector/inspectorhandler.h"
-#include "ipaddresslookup.h"
 #include "keyregenerator.h"
 #include "leakdetector.h"
 #include "logger.h"
-#include "models/devicemodel.h"
-#include "models/recentconnections.h"
-#include "models/recommendedlocationmodel.h"
 #include "models/servercountrymodel.h"
-#include "models/subscriptiondata.h"
-#include "models/supportcategorymodel.h"
-#include "models/user.h"
 #include "mozillavpn.h"
-#include "networkrequest.h"
 #include "notificationhandler.h"
-#include "productshandler.h"
-#include "profileflow.h"
-#include "purchasehandler.h"
 #include "qmlengineholder.h"
-#include "releasemonitor.h"
-#include "serverlatency.h"
 #include "settingsholder.h"
 #include "telemetry.h"
 #include "temporarydir.h"
-#include "update/updater.h"
 
 #ifdef MZ_DEBUG
 #  include <QQmlDebuggingEnabler>
@@ -80,10 +62,7 @@
 #ifdef MZ_WINDOWS
 #  include <windows.h>
 
-#  include <iostream>
-
 #  include "eventlistener.h"
-#  include "platforms/windows/windowsappimageprovider.h"
 #  include "platforms/windows/windowsstartatbootwatcher.h"
 #endif
 

src/connectionhealth.cpp

@@ -14,7 +14,6 @@
 #include "glean/generated/metrics.h"
 #include "leakdetector.h"
 #include "logger.h"
-#include "models/server.h"
 #include "mozillavpn.h"
 #include "settingsholder.h"
 

src/controller.cpp

@@ -8,8 +8,6 @@
 #include <QNetworkInformation>
 
 #include "app.h"
-#include "apppermission.h"
-#include "captiveportal/captiveportal.h"
 #include "constants.h"
 #include "controllerimpl.h"
 #include "dnshelper.h"
@@ -34,7 +32,6 @@
 #include "settingsholder.h"
 #include "tasks/controlleraction/taskcontrolleraction.h"
 #include "tasks/function/taskfunction.h"
-#include "tasks/heartbeat/taskheartbeat.h"
 #include "taskscheduler.h"
 
 #if defined(MZ_FLATPAK)

src/controller.h

@@ -10,18 +10,15 @@
 #include <QObject>
 #include <QTimer>
 
-#include "controller.h"
 #include "interfaceconfig.h"
 #include "ipaddress.h"
 #include "loghandler.h"
 #include "models/server.h"
 #include "models/serverdata.h"
-#include "mozillavpn.h"
 #include "pinghelper.h"
 
 class Controller;
 class ControllerImpl;
-class MozillaVPN;
 
 class Controller : public QObject, public LogSerializer {
   Q_OBJECT

src/dnshelper.cpp

@@ -7,12 +7,7 @@
 #include <QHostAddress>
 
 #include "feature/feature.h"
-#include "ipaddress.h"
 #include "logger.h"
-#include "rfc/rfc1918.h"
-#include "rfc/rfc4193.h"
-#include "rfc/rfc4291.h"
-#include "rfc/rfc5735.h"
 #include "settingsholder.h"
 
 namespace {

src/inspector/inspectorhandler.cpp

@@ -38,8 +38,6 @@
 #include "localizer.h"
 #include "logger.h"
 #include "loghandler.h"
-#include "models/subscriptiondata.h"
-#include "mozillavpn.h"
 #include "mzglean.h"
 #include "networkmanager.h"
 #include "qmlengineholder.h"

src/localizer.cpp

@@ -16,7 +16,6 @@
 
 #include "constants.h"
 #include "glean/generated/metrics.h"
-#include "glean/mzglean.h"
 #include "i18nlanguagenames.h"
 #include "i18nstrings.h"
 #include "leakdetector.h"

src/mozillavpn.cpp

@@ -19,13 +19,11 @@
 #include "glean/generated/metrics.h"
 #include "glean/generated/pings.h"
 #include "glean/mzglean.h"
-#include "i18nstrings.h"
 #include "inspector/inspectorhandler.h"
 #include "leakdetector.h"
 #include "localizer.h"
 #include "logger.h"
 #include "loghandler.h"
-#include "logoutobserver.h"
 #include "models/device.h"
 #include "models/devicemodel.h"
 #include "models/keys.h"

src/mozillavpn.h

@@ -12,7 +12,6 @@
 
 #include "app.h"
 #include "authenticationlistener.h"
-#include "errorhandler.h"
 #include "frontend/navigator.h"
 
 struct MozillaVPNPrivate;

src/networkwatcher.cpp

@@ -13,7 +13,6 @@
 #include "logger.h"
 #include "mozillavpn.h"
 #include "networkwatcherimpl.h"
-#include "platforms/dummy/dummynetworkwatcher.h"
 #include "settingsholder.h"
 
 #ifdef MZ_WINDOWS
@@ -39,6 +38,10 @@
 #  include "platforms/ios/iosnetworkwatcher.h"
 #endif
 
+#ifdef UNIT_TEST
+#  include "platforms/dummy/dummynetworkwatcher.h"
+#endif
+
 // How often we notify the same unsecured network
 #ifndef UNIT_TEST
 constexpr uint32_t NETWORK_WATCHER_TIMER_MSEC = 20000;
@@ -67,7 +70,7 @@ void NetworkWatcher::initialize() {
   m_impl = new AndroidNetworkWatcher(this);
 #elif defined(MZ_IOS)
   m_impl = new IOSNetworkWatcher(this);
-#else
+#elif defined(UNIT_TEST)
   m_impl = new DummyNetworkWatcher(this);
 #endif
 

src/profileflow.cpp

@@ -7,10 +7,8 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-#include "glean/generated/metrics.h"
 #include "leakdetector.h"
 #include "logger.h"
-#include "models/subscriptiondata.h"
 #include "mozillavpn.h"
 #include "tasks/getsubscriptiondetails/taskgetsubscriptiondetails.h"
 #include "taskscheduler.h"

src/purchasehandler.h

@@ -7,8 +7,6 @@
 
 #include <QObject>
 
-#include "productshandler.h"
-
 class PurchaseHandler : public QObject {
   Q_OBJECT
   Q_DISABLE_COPY_MOVE(PurchaseHandler)

src/purchaseiaphandler.h

@@ -7,6 +7,7 @@
 
 #include <QObject>
 
+#include "productshandler.h"
 #include "purchasehandler.h"
 
 class PurchaseIAPHandler : public PurchaseHandler {

src/purchasewebhandler.cpp

@@ -5,7 +5,6 @@
 #include "purchasewebhandler.h"
 
 #include "authenticationlistener.h"
-#include "constants.h"
 #include "leakdetector.h"
 #include "logger.h"
 #include "mozillavpn.h"

src/qmlengineholder.cpp

@@ -17,7 +17,6 @@
 #include "frontend/navigator.h"
 #include "glean/generated/metrics.h"
 #include "glean/generated/pings.h"
-#include "glean/mzglean.h"
 #include "leakdetector.h"
 #include "localizer.h"
 #include "loghandler.h"

src/settingsholder.h

@@ -9,8 +9,9 @@
 #include <QObject>
 #include <QVariant>
 
-#include "constants.h"
-#include "feature/feature.h"
+// Used in the ettingslist.h
+#include "constants.h"        // IWYU pragma: keep
+#include "feature/feature.h"  // IWYU pragma: keep
 #include "settings/setting.h"
 #include "settings/settingsmanager.h"
 

src/subscriptionmonitor.cpp

@@ -6,7 +6,6 @@
 
 #include <QCoreApplication>
 
-#include "constants.h"
 #include "controller.h"
 #include "leakdetector.h"
 #include "logger.h"

src/systemtraynotificationhandler.cpp

@@ -11,7 +11,6 @@
 
 #include "constants.h"
 #include "controller.h"
-#include "frontend/navigator.h"
 #include "i18nstrings.h"
 #include "leakdetector.h"
 #include "logger.h"

src/telemetry.cpp

@@ -5,8 +5,6 @@
 #include "telemetry.h"
 
 #include "apppermission.h"
-#include "connectionhealth.h"
-#include "constants.h"
 #include "controller.h"
 #include "dnshelper.h"
 #include "feature/feature.h"
@@ -15,8 +13,6 @@
 #include "leakdetector.h"
 #include "logger.h"
 #include "mozillavpn.h"
-#include "networkwatcher.h"
-#include "purchasehandler.h"
 #include "settingsholder.h"
 
 #if defined(MZ_ANDROID)

src/webextensiontelemetry.cpp

@@ -15,7 +15,6 @@
 #include "glean/generated/pings.h"
 #include "glean/quantity.h"
 #include "logger.h"
-#include "settingsholder.h"
 
 namespace {
 Logger logger("WebExtensionTelemetry");