From 97e9d555888e7924bdec7824013f3c7f6ec237f0 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Thu, 24 Aug 2023 04:25:17 +0800
Subject: [PATCH] cpplint:   `build/include_what_you_use` (#29556)

* include_what_you_use

* remove comments

* include <memory>

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 2d99521e7500902070d0aacce69528bcfd8b9964
---
 .pre-commit-config.yaml                   | 2 +-
 common/gpio.cc                            | 2 ++
 common/ratekeeper.cc                      | 2 ++
 common/watchdog.cc                        | 2 ++
 selfdrive/boardd/boardd.cc                | 1 +
 selfdrive/boardd/boardd.h                 | 3 +++
 selfdrive/boardd/panda.cc                 | 1 +
 selfdrive/boardd/panda.h                  | 1 +
 selfdrive/locationd/locationd.cc          | 2 ++
 selfdrive/locationd/locationd.h           | 1 +
 selfdrive/locationd/models/live_kf.h      | 2 ++
 selfdrive/modeld/runners/onnxmodel.h      | 2 ++
 selfdrive/modeld/runners/snpemodel.cc     | 4 ++++
 selfdrive/modeld/runners/snpemodel.h      | 4 ++++
 selfdrive/modeld/runners/thneedmodel.cc   | 2 ++
 selfdrive/modeld/runners/thneedmodel.h    | 2 ++
 selfdrive/ui/installer/installer.cc       | 1 +
 selfdrive/ui/qt/api.cc                    | 2 ++
 selfdrive/ui/qt/maps/map_helpers.cc       | 4 ++++
 selfdrive/ui/qt/maps/map_helpers.h        | 2 ++
 selfdrive/ui/qt/maps/map_instructions.h   | 3 +++
 selfdrive/ui/qt/maps/map_settings.cc      | 2 ++
 selfdrive/ui/qt/maps/map_settings.h       | 2 ++
 selfdrive/ui/qt/offroad/driverview.cc     | 1 +
 selfdrive/ui/qt/offroad/networking.h      | 2 ++
 selfdrive/ui/qt/offroad/onboarding.cc     | 2 ++
 selfdrive/ui/qt/offroad/settings.cc       | 2 ++
 selfdrive/ui/qt/offroad/settings.h        | 3 +++
 selfdrive/ui/qt/onroad.cc                 | 3 +++
 selfdrive/ui/qt/onroad.h                  | 2 ++
 selfdrive/ui/qt/setup/setup.cc            | 2 ++
 selfdrive/ui/qt/sidebar.h                 | 2 ++
 selfdrive/ui/qt/spinner.cc                | 1 +
 selfdrive/ui/qt/util.cc                   | 4 ++++
 selfdrive/ui/qt/util.h                    | 1 +
 selfdrive/ui/qt/widgets/cameraview.cc     | 3 +++
 selfdrive/ui/qt/widgets/cameraview.h      | 5 +++++
 selfdrive/ui/qt/widgets/controls.h        | 3 +++
 selfdrive/ui/qt/widgets/keyboard.h        | 2 ++
 selfdrive/ui/qt/widgets/offroad_alerts.cc | 5 +++++
 selfdrive/ui/qt/widgets/offroad_alerts.h  | 1 +
 selfdrive/ui/soundd/sound.h               | 2 ++
 selfdrive/ui/ui.cc                        | 1 +
 selfdrive/ui/ui.h                         | 1 +
 system/camerad/cameras/camera_common.cc   | 1 +
 system/camerad/cameras/camera_qcom2.cc    | 3 +++
 system/hardware/base.h                    | 3 +++
 system/hardware/hw.h                      | 2 ++
 system/hardware/pc/hardware.h             | 2 ++
 system/hardware/tici/hardware.h           | 2 ++
 system/loggerd/encoder/encoder.h          | 1 +
 system/loggerd/encoder/v4l_encoder.cc     | 1 +
 system/loggerd/logger.cc                  | 3 +++
 system/loggerd/logger.h                   | 3 ++-
 system/loggerd/loggerd.cc                 | 4 ++++
 system/loggerd/loggerd.h                  | 2 ++
 system/sensord/sensors/i2c_sensor.h       | 1 +
 system/ubloxd/ublox_msg.cc                | 2 ++
 system/ubloxd/ublox_msg.h                 | 3 ++-
 tools/cabana/binaryview.cc                | 2 ++
 tools/cabana/binaryview.h                 | 3 +++
 tools/cabana/chart/chart.cc               | 3 +++
 tools/cabana/chart/chart.h                | 3 +++
 tools/cabana/chart/chartswidget.cc        | 2 ++
 tools/cabana/chart/chartswidget.h         | 3 +++
 tools/cabana/chart/sparkline.cc           | 1 +
 tools/cabana/chart/sparkline.h            | 2 ++
 tools/cabana/chart/tiplabel.cc            | 2 ++
 tools/cabana/commands.h                   | 2 ++
 tools/cabana/dbc/dbc.cc                   | 2 ++
 tools/cabana/dbc/dbc.h                    | 6 +++++-
 tools/cabana/dbc/dbcmanager.h             | 1 +
 tools/cabana/historylog.cc                | 2 ++
 tools/cabana/historylog.h                 | 2 ++
 tools/cabana/mainwin.cc                   | 3 +++
 tools/cabana/messageswidget.cc            | 6 ++++++
 tools/cabana/messageswidget.h             | 4 ++++
 tools/cabana/signalview.cc                | 2 ++
 tools/cabana/signalview.h                 | 2 ++
 tools/cabana/streams/abstractstream.cc    | 3 +++
 tools/cabana/streams/abstractstream.h     | 4 ++++
 tools/cabana/streams/devicestream.cc      | 3 +++
 tools/cabana/streams/livestream.cc        | 3 +++
 tools/cabana/streams/livestream.h         | 4 ++++
 tools/cabana/streams/pandastream.cc       | 2 ++
 tools/cabana/streams/pandastream.h        | 3 +++
 tools/cabana/streams/replaystream.h       | 6 ++++++
 tools/cabana/streams/socketcanstream.h    | 2 ++
 tools/cabana/tools/findsignal.h           | 3 +++
 tools/cabana/tools/findsimilarbits.cc     | 2 ++
 tools/cabana/util.cc                      | 3 +++
 tools/cabana/util.h                       | 2 ++
 tools/cabana/videowidget.cc               | 5 +++++
 tools/cabana/videowidget.h                | 4 ++++
 tools/replay/camera.h                     | 4 ++++
 tools/replay/consoleui.cc                 | 6 +++++-
 tools/replay/framereader.cc               | 1 +
 tools/replay/logreader.h                  | 3 +++
 tools/replay/replay.h                     | 8 ++++++++
 tools/replay/route.cc                     | 6 ++++--
 tools/replay/route.h                      | 5 +++++
 tools/replay/util.cc                      | 2 ++
 102 files changed, 260 insertions(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 65140282ee..85e75396ed 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -64,7 +64,7 @@ repos:
         - --linelength=240
         # https://google.github.io/styleguide/cppguide.html
         # relevant rules are whitelisted, see all options with: cpplint --filter=
-        - --filter=-build,-legal,-readability,-runtime,-whitespace,+build/forward_decl,+build/deprecated,+whitespace/line_length,+whitespace/empty_if_body,+whitespace/empty_loop_body,+whitespace/empty_conditional_body,+readability/braces
+        - --filter=-build,-legal,-readability,-runtime,-whitespace,+build/forward_decl,+build/include_what_you_use,+build/deprecated,+whitespace/line_length,+whitespace/empty_if_body,+whitespace/empty_loop_body,+whitespace/empty_conditional_body,+readability/braces
 -   repo: local
     hooks:
     -   id: test_translations
diff --git a/common/gpio.cc b/common/gpio.cc
index 8a16cd3703..c1805b7bdc 100644
--- a/common/gpio.cc
+++ b/common/gpio.cc
@@ -1,5 +1,7 @@
 #include "common/gpio.h"
 
+#include <string>
+
 #ifdef __APPLE__
 int gpio_init(int pin_nr, bool output) {
   return 0;
diff --git a/common/ratekeeper.cc b/common/ratekeeper.cc
index c00d72a94a..7e63815168 100644
--- a/common/ratekeeper.cc
+++ b/common/ratekeeper.cc
@@ -1,5 +1,7 @@
 #include "common/ratekeeper.h"
 
+#include <algorithm>
+
 #include "common/swaglog.h"
 #include "common/timing.h"
 #include "common/util.h"
diff --git a/common/watchdog.cc b/common/watchdog.cc
index 920df4030a..3483ad21c2 100644
--- a/common/watchdog.cc
+++ b/common/watchdog.cc
@@ -1,3 +1,5 @@
+#include <string>
+
 #include "common/watchdog.h"
 #include "common/util.h"
 
diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
index 6a19f6d593..b64a81296e 100644
--- a/selfdrive/boardd/boardd.cc
+++ b/selfdrive/boardd/boardd.cc
@@ -18,6 +18,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <future>
+#include <memory>
 #include <thread>
 
 #include "cereal/gen/cpp/car.capnp.h"
diff --git a/selfdrive/boardd/boardd.h b/selfdrive/boardd/boardd.h
index d3c9e1f94a..0646fc6189 100644
--- a/selfdrive/boardd/boardd.h
+++ b/selfdrive/boardd/boardd.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "selfdrive/boardd/panda.h"
 
 bool safety_setter_thread(std::vector<Panda *> pandas);
diff --git a/selfdrive/boardd/panda.cc b/selfdrive/boardd/panda.cc
index 8849a46bd8..e075887a4d 100644
--- a/selfdrive/boardd/panda.cc
+++ b/selfdrive/boardd/panda.cc
@@ -4,6 +4,7 @@
 
 #include <cassert>
 #include <stdexcept>
+#include <vector>
 
 #include "cereal/messaging/messaging.h"
 #include "common/swaglog.h"
diff --git a/selfdrive/boardd/panda.h b/selfdrive/boardd/panda.h
index 5edca04419..9d4b1b2092 100644
--- a/selfdrive/boardd/panda.h
+++ b/selfdrive/boardd/panda.h
@@ -6,6 +6,7 @@
 #include <list>
 #include <memory>
 #include <optional>
+#include <string>
 #include <vector>
 
 #include "cereal/gen/cpp/car.capnp.h"
diff --git a/selfdrive/locationd/locationd.cc b/selfdrive/locationd/locationd.cc
index 37fbb6b260..d79b5c9c44 100755
--- a/selfdrive/locationd/locationd.cc
+++ b/selfdrive/locationd/locationd.cc
@@ -1,7 +1,9 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
+#include <algorithm>
 #include <cmath>
+#include <vector>
 
 #include "locationd.h"
 
diff --git a/selfdrive/locationd/locationd.h b/selfdrive/locationd/locationd.h
index e8f2f04a2c..f7adab3673 100755
--- a/selfdrive/locationd/locationd.h
+++ b/selfdrive/locationd/locationd.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <eigen3/Eigen/Dense>
+#include <deque>
 #include <fstream>
 #include <memory>
 #include <map>
diff --git a/selfdrive/locationd/models/live_kf.h b/selfdrive/locationd/models/live_kf.h
index 06ec3854cb..c2f3f37eaf 100755
--- a/selfdrive/locationd/models/live_kf.h
+++ b/selfdrive/locationd/models/live_kf.h
@@ -3,6 +3,8 @@
 #include <string>
 #include <cmath>
 #include <memory>
+#include <unordered_map>
+#include <vector>
 
 #include <eigen3/Eigen/Core>
 #include <eigen3/Eigen/Dense>
diff --git a/selfdrive/modeld/runners/onnxmodel.h b/selfdrive/modeld/runners/onnxmodel.h
index 6c325f644e..42aa179ce9 100644
--- a/selfdrive/modeld/runners/onnxmodel.h
+++ b/selfdrive/modeld/runners/onnxmodel.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "selfdrive/modeld/runners/runmodel.h"
 
 class ONNXModel : public RunModel {
diff --git a/selfdrive/modeld/runners/snpemodel.cc b/selfdrive/modeld/runners/snpemodel.cc
index 441122c522..5ed2d1270e 100644
--- a/selfdrive/modeld/runners/snpemodel.cc
+++ b/selfdrive/modeld/runners/snpemodel.cc
@@ -3,6 +3,10 @@
 #include "selfdrive/modeld/runners/snpemodel.h"
 
 #include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "common/util.h"
 #include "common/timing.h"
diff --git a/selfdrive/modeld/runners/snpemodel.h b/selfdrive/modeld/runners/snpemodel.h
index 0ae5a8f820..559b15f8b6 100644
--- a/selfdrive/modeld/runners/snpemodel.h
+++ b/selfdrive/modeld/runners/snpemodel.h
@@ -1,6 +1,10 @@
 #pragma once
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <DlContainer/IDlContainer.hpp>
 #include <DlSystem/DlError.hpp>
 #include <DlSystem/ITensor.hpp>
diff --git a/selfdrive/modeld/runners/thneedmodel.cc b/selfdrive/modeld/runners/thneedmodel.cc
index 0f35c94800..a16d8b42aa 100644
--- a/selfdrive/modeld/runners/thneedmodel.cc
+++ b/selfdrive/modeld/runners/thneedmodel.cc
@@ -1,5 +1,7 @@
 #include "selfdrive/modeld/runners/thneedmodel.h"
 
+#include <string>
+
 #include "common/swaglog.h"
 
 ThneedModel::ThneedModel(const std::string path, float *_output, size_t _output_size, int runtime, bool luse_tf8, cl_context context) {
diff --git a/selfdrive/modeld/runners/thneedmodel.h b/selfdrive/modeld/runners/thneedmodel.h
index 90c40239bf..6ed479c081 100644
--- a/selfdrive/modeld/runners/thneedmodel.h
+++ b/selfdrive/modeld/runners/thneedmodel.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "selfdrive/modeld/runners/runmodel.h"
 #include "selfdrive/modeld/thneed/thneed.h"
 
diff --git a/selfdrive/ui/installer/installer.cc b/selfdrive/ui/installer/installer.cc
index 1af72c04df..179ce60c63 100644
--- a/selfdrive/ui/installer/installer.cc
+++ b/selfdrive/ui/installer/installer.cc
@@ -4,6 +4,7 @@
 #include <cstdlib>
 #include <fstream>
 #include <map>
+#include <string>
 
 #include <QDebug>
 #include <QDir>
diff --git a/selfdrive/ui/qt/api.cc b/selfdrive/ui/qt/api.cc
index 84e1a4032e..b73772544b 100644
--- a/selfdrive/ui/qt/api.cc
+++ b/selfdrive/ui/qt/api.cc
@@ -12,6 +12,8 @@
 #include <QJsonDocument>
 #include <QNetworkRequest>
 
+#include <string>
+
 #include "common/params.h"
 #include "common/util.h"
 #include "system/hardware/hw.h"
diff --git a/selfdrive/ui/qt/maps/map_helpers.cc b/selfdrive/ui/qt/maps/map_helpers.cc
index 0f96638820..a410ab6ee7 100644
--- a/selfdrive/ui/qt/maps/map_helpers.cc
+++ b/selfdrive/ui/qt/maps/map_helpers.cc
@@ -1,5 +1,9 @@
 #include "selfdrive/ui/qt/maps/map_helpers.h"
 
+#include <algorithm>
+#include <string>
+#include <utility>
+
 #include <QJsonDocument>
 #include <QJsonObject>
 
diff --git a/selfdrive/ui/qt/maps/map_helpers.h b/selfdrive/ui/qt/maps/map_helpers.h
index 0090753a40..6c6a8d12fb 100644
--- a/selfdrive/ui/qt/maps/map_helpers.h
+++ b/selfdrive/ui/qt/maps/map_helpers.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <optional>
+#include <string>
+#include <utility>
 #include <eigen3/Eigen/Dense>
 #include <QMapboxGL>
 #include <QGeoCoordinate>
diff --git a/selfdrive/ui/qt/maps/map_instructions.h b/selfdrive/ui/qt/maps/map_instructions.h
index 6c08cb9b9e..06a943d27f 100644
--- a/selfdrive/ui/qt/maps/map_instructions.h
+++ b/selfdrive/ui/qt/maps/map_instructions.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <map>
+#include <vector>
+
 #include <QHash>
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/selfdrive/ui/qt/maps/map_settings.cc b/selfdrive/ui/qt/maps/map_settings.cc
index 018d0df984..48a7733c52 100644
--- a/selfdrive/ui/qt/maps/map_settings.cc
+++ b/selfdrive/ui/qt/maps/map_settings.cc
@@ -1,5 +1,7 @@
 #include "map_settings.h"
 
+#include <utility>
+
 #include <QApplication>
 #include <QDebug>
 
diff --git a/selfdrive/ui/qt/maps/map_settings.h b/selfdrive/ui/qt/maps/map_settings.h
index ffec1f980f..bee0061932 100644
--- a/selfdrive/ui/qt/maps/map_settings.h
+++ b/selfdrive/ui/qt/maps/map_settings.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 #include <QFrame>
 #include <QJsonArray>
 #include <QJsonDocument>
diff --git a/selfdrive/ui/qt/offroad/driverview.cc b/selfdrive/ui/qt/offroad/driverview.cc
index cc715c6755..4d09d914d3 100644
--- a/selfdrive/ui/qt/offroad/driverview.cc
+++ b/selfdrive/ui/qt/offroad/driverview.cc
@@ -1,5 +1,6 @@
 #include "selfdrive/ui/qt/offroad/driverview.h"
 
+#include <algorithm>
 #include <QPainter>
 
 #include "selfdrive/ui/qt/qt_window.h"
diff --git a/selfdrive/ui/qt/offroad/networking.h b/selfdrive/ui/qt/offroad/networking.h
index cdcdf067ab..81ffb3cf2d 100644
--- a/selfdrive/ui/qt/offroad/networking.h
+++ b/selfdrive/ui/qt/offroad/networking.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 #include "selfdrive/ui/qt/offroad/wifiManager.h"
 #include "selfdrive/ui/qt/widgets/input.h"
 #include "selfdrive/ui/qt/widgets/ssh_keys.h"
diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc
index 5bf1b6fc43..c7c22f0ea3 100644
--- a/selfdrive/ui/qt/offroad/onboarding.cc
+++ b/selfdrive/ui/qt/offroad/onboarding.cc
@@ -1,5 +1,7 @@
 #include "selfdrive/ui/qt/offroad/onboarding.h"
 
+#include <string>
+
 #include <QLabel>
 #include <QPainter>
 #include <QQmlContext>
diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
index 05aef8364c..804bf037a1 100644
--- a/selfdrive/ui/qt/offroad/settings.cc
+++ b/selfdrive/ui/qt/offroad/settings.cc
@@ -3,6 +3,8 @@
 #include <cassert>
 #include <cmath>
 #include <string>
+#include <tuple>
+#include <vector>
 
 #include <QDebug>
 
diff --git a/selfdrive/ui/qt/offroad/settings.h b/selfdrive/ui/qt/offroad/settings.h
index edba5be800..a5dd25b14f 100644
--- a/selfdrive/ui/qt/offroad/settings.h
+++ b/selfdrive/ui/qt/offroad/settings.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <map>
+#include <string>
+
 #include <QButtonGroup>
 #include <QFrame>
 #include <QLabel>
diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index 7c070d2adf..d5b2bbcf6b 100644
--- a/selfdrive/ui/qt/onroad.cc
+++ b/selfdrive/ui/qt/onroad.cc
@@ -1,6 +1,9 @@
 #include "selfdrive/ui/qt/onroad.h"
 
+#include <algorithm>
 #include <cmath>
+#include <map>
+#include <memory>
 
 #include <QDebug>
 #include <QMouseEvent>
diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h
index 1975ec9f01..df43ff97f1 100644
--- a/selfdrive/ui/qt/onroad.h
+++ b/selfdrive/ui/qt/onroad.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include <QPushButton>
 #include <QStackedLayout>
 #include <QWidget>
diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc
index de5021c8bc..cdb49f1dfc 100644
--- a/selfdrive/ui/qt/setup/setup.cc
+++ b/selfdrive/ui/qt/setup/setup.cc
@@ -10,6 +10,8 @@
 
 #include <curl/curl.h>
 
+#include <string>
+
 #include "common/util.h"
 #include "system/hardware/hw.h"
 #include "selfdrive/ui/qt/api.h"
diff --git a/selfdrive/ui/qt/sidebar.h b/selfdrive/ui/qt/sidebar.h
index fb96e1d540..f627aac810 100644
--- a/selfdrive/ui/qt/sidebar.h
+++ b/selfdrive/ui/qt/sidebar.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include <QFrame>
 #include <QMap>
 
diff --git a/selfdrive/ui/qt/spinner.cc b/selfdrive/ui/qt/spinner.cc
index 73a0f5014e..2404efa668 100644
--- a/selfdrive/ui/qt/spinner.cc
+++ b/selfdrive/ui/qt/spinner.cc
@@ -1,5 +1,6 @@
 #include "selfdrive/ui/qt/spinner.h"
 
+#include <algorithm>
 #include <cstdio>
 #include <iostream>
 #include <string>
diff --git a/selfdrive/ui/qt/util.cc b/selfdrive/ui/qt/util.cc
index 3804aacd78..1e25d2d536 100644
--- a/selfdrive/ui/qt/util.cc
+++ b/selfdrive/ui/qt/util.cc
@@ -1,5 +1,9 @@
 #include "selfdrive/ui/qt/util.h"
 
+#include <map>
+#include <string>
+#include <vector>
+
 #include <QApplication>
 #include <QFile>
 #include <QFileInfo>
diff --git a/selfdrive/ui/qt/util.h b/selfdrive/ui/qt/util.h
index 2b1200a861..1aa3bd69b1 100644
--- a/selfdrive/ui/qt/util.h
+++ b/selfdrive/ui/qt/util.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <optional>
+#include <vector>
 
 #include <QDateTime>
 #include <QFileSystemWatcher>
diff --git a/selfdrive/ui/qt/widgets/cameraview.cc b/selfdrive/ui/qt/widgets/cameraview.cc
index 4da5b7b18e..38824aa8db 100644
--- a/selfdrive/ui/qt/widgets/cameraview.cc
+++ b/selfdrive/ui/qt/widgets/cameraview.cc
@@ -7,6 +7,9 @@
 #endif
 
 #include <cmath>
+#include <set>
+#include <string>
+#include <utility>
 
 #include <QOpenGLBuffer>
 #include <QOffscreenSurface>
diff --git a/selfdrive/ui/qt/widgets/cameraview.h b/selfdrive/ui/qt/widgets/cameraview.h
index 67568ea55c..647653cdd3 100644
--- a/selfdrive/ui/qt/widgets/cameraview.h
+++ b/selfdrive/ui/qt/widgets/cameraview.h
@@ -1,7 +1,12 @@
 #pragma once
 
+#include <deque>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <set>
+#include <string>
+#include <utility>
 
 #include <QOpenGLFunctions>
 #include <QOpenGLShaderProgram>
diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h
index fac66de9ed..811595726d 100644
--- a/selfdrive/ui/qt/widgets/controls.h
+++ b/selfdrive/ui/qt/widgets/controls.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include <QButtonGroup>
 #include <QFrame>
 #include <QHBoxLayout>
diff --git a/selfdrive/ui/qt/widgets/keyboard.h b/selfdrive/ui/qt/widgets/keyboard.h
index 516105719b..efc02d075d 100644
--- a/selfdrive/ui/qt/widgets/keyboard.h
+++ b/selfdrive/ui/qt/widgets/keyboard.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 #include <QFrame>
 #include <QPushButton>
 #include <QStackedLayout>
diff --git a/selfdrive/ui/qt/widgets/offroad_alerts.cc b/selfdrive/ui/qt/widgets/offroad_alerts.cc
index cdfa86c8eb..74ece36d15 100644
--- a/selfdrive/ui/qt/widgets/offroad_alerts.cc
+++ b/selfdrive/ui/qt/widgets/offroad_alerts.cc
@@ -1,5 +1,10 @@
 #include "selfdrive/ui/qt/widgets/offroad_alerts.h"
 
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <utility>
+
 #include <QHBoxLayout>
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/selfdrive/ui/qt/widgets/offroad_alerts.h b/selfdrive/ui/qt/widgets/offroad_alerts.h
index 69c12b0602..ace2e75456 100644
--- a/selfdrive/ui/qt/widgets/offroad_alerts.h
+++ b/selfdrive/ui/qt/widgets/offroad_alerts.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <map>
+#include <string>
 
 #include <QLabel>
 #include <QPushButton>
diff --git a/selfdrive/ui/soundd/sound.h b/selfdrive/ui/soundd/sound.h
index 9cabd1c6bd..f7084fff97 100644
--- a/selfdrive/ui/soundd/sound.h
+++ b/selfdrive/ui/soundd/sound.h
@@ -1,3 +1,5 @@
+#include <tuple>
+
 #include <QMap>
 #include <QSoundEffect>
 #include <QString>
diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
index 32d8ae80ad..5a01e7f8eb 100644
--- a/selfdrive/ui/ui.cc
+++ b/selfdrive/ui/ui.cc
@@ -1,5 +1,6 @@
 #include "selfdrive/ui/ui.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
 
diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
index 31488431b1..82f65d128f 100644
--- a/selfdrive/ui/ui.h
+++ b/selfdrive/ui/ui.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <map>
 #include <memory>
 #include <string>
 #include <optional>
diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc
index 1b2594bc80..1eb636b7a2 100644
--- a/system/camerad/cameras/camera_common.cc
+++ b/system/camerad/cameras/camera_common.cc
@@ -5,6 +5,7 @@
 #include <cassert>
 #include <cstdio>
 #include <chrono>
+#include <string>
 #include <thread>
 
 #include "libyuv.h"
diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc
index df70b7983d..95ec47171d 100644
--- a/system/camerad/cameras/camera_qcom2.cc
+++ b/system/camerad/cameras/camera_qcom2.cc
@@ -6,12 +6,15 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
+#include <algorithm>
 #include <atomic>
 #include <cassert>
 #include <cerrno>
 #include <cmath>
 #include <cstdio>
 #include <cstring>
+#include <string>
+#include <vector>
 
 #include "media/cam_defs.h"
 #include "media/cam_isp.h"
diff --git a/system/hardware/base.h b/system/hardware/base.h
index 2096e1e0bb..d86b316843 100644
--- a/system/hardware/base.h
+++ b/system/hardware/base.h
@@ -2,6 +2,9 @@
 
 #include <cstdlib>
 #include <fstream>
+#include <map>
+#include <string>
+
 #include "cereal/messaging/messaging.h"
 
 // no-op base hw class
diff --git a/system/hardware/hw.h b/system/hardware/hw.h
index 3b0583a10b..1274851787 100644
--- a/system/hardware/hw.h
+++ b/system/hardware/hw.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "system/hardware/base.h"
 #include "common/util.h"
 
diff --git a/system/hardware/pc/hardware.h b/system/hardware/pc/hardware.h
index 84fb3bd89e..5cd825d61d 100644
--- a/system/hardware/pc/hardware.h
+++ b/system/hardware/pc/hardware.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "system/hardware/base.h"
 
 class HardwarePC : public HardwareNone {
diff --git a/system/hardware/tici/hardware.h b/system/hardware/tici/hardware.h
index 82648ac984..c1a2dcb169 100644
--- a/system/hardware/tici/hardware.h
+++ b/system/hardware/tici/hardware.h
@@ -2,6 +2,8 @@
 
 #include <cstdlib>
 #include <fstream>
+#include <map>
+#include <string>
 
 #include "common/params.h"
 #include "common/util.h"
diff --git a/system/loggerd/encoder/encoder.h b/system/loggerd/encoder/encoder.h
index bf70775b7c..a8bfd5c054 100644
--- a/system/loggerd/encoder/encoder.h
+++ b/system/loggerd/encoder/encoder.h
@@ -2,6 +2,7 @@
 
 #include <cassert>
 #include <cstdint>
+#include <memory>
 #include <thread>
 
 #include "cereal/messaging/messaging.h"
diff --git a/system/loggerd/encoder/v4l_encoder.cc b/system/loggerd/encoder/v4l_encoder.cc
index a319d414ca..2f74c3785a 100644
--- a/system/loggerd/encoder/v4l_encoder.cc
+++ b/system/loggerd/encoder/v4l_encoder.cc
@@ -1,4 +1,5 @@
 #include <cassert>
+#include <string>
 #include <sys/ioctl.h>
 #include <poll.h>
 
diff --git a/system/loggerd/logger.cc b/system/loggerd/logger.cc
index 1e710759e6..31b302ffe6 100644
--- a/system/loggerd/logger.cc
+++ b/system/loggerd/logger.cc
@@ -13,7 +13,10 @@
 #include <ctime>
 #include <fstream>
 #include <iostream>
+#include <map>
 #include <streambuf>
+#include <string>
+#include <vector>
 
 #include "common/params.h"
 #include "common/swaglog.h"
diff --git a/system/loggerd/logger.h b/system/loggerd/logger.h
index e7594cee88..36db1a5a74 100644
--- a/system/loggerd/logger.h
+++ b/system/loggerd/logger.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <cassert>
 #include <pthread.h>
 
+#include <cassert>
 #include <cstdint>
 #include <cstdio>
 #include <memory>
+#include <string>
 
 #include <capnp/serialize.h>
 #include <kj/array.h>
diff --git a/system/loggerd/loggerd.cc b/system/loggerd/loggerd.cc
index 56fc11f62c..303235e9d8 100644
--- a/system/loggerd/loggerd.cc
+++ b/system/loggerd/loggerd.cc
@@ -1,6 +1,10 @@
 #include <sys/xattr.h>
 
+#include <map>
+#include <memory>
+#include <string>
 #include <unordered_map>
+#include <vector>
 
 #include "system/loggerd/encoder/encoder.h"
 #include "system/loggerd/loggerd.h"
diff --git a/system/loggerd/loggerd.h b/system/loggerd/loggerd.h
index 531b30e9f2..cfc06c28d3 100644
--- a/system/loggerd/loggerd.h
+++ b/system/loggerd/loggerd.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 #include "cereal/messaging/messaging.h"
 #include "cereal/services.h"
 #include "cereal/visionipc/visionipc_client.h"
diff --git a/system/sensord/sensors/i2c_sensor.h b/system/sensord/sensors/i2c_sensor.h
index ccac526c12..ba100c3b01 100644
--- a/system/sensord/sensors/i2c_sensor.h
+++ b/system/sensord/sensors/i2c_sensor.h
@@ -2,6 +2,7 @@
 
 #include <cstdint>
 #include <unistd.h>
+#include <vector>
 #include "cereal/gen/cpp/log.capnp.h"
 
 #include "common/i2c.h"
diff --git a/system/ubloxd/ublox_msg.cc b/system/ubloxd/ublox_msg.cc
index 02993a574d..c0554773a2 100644
--- a/system/ubloxd/ublox_msg.cc
+++ b/system/ubloxd/ublox_msg.cc
@@ -2,6 +2,7 @@
 
 #include <unistd.h>
 
+#include <algorithm>
 #include <cassert>
 #include <chrono>
 #include <cmath>
@@ -9,6 +10,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <unordered_map>
+#include <utility>
 
 #include "common/swaglog.h"
 
diff --git a/system/ubloxd/ublox_msg.h b/system/ubloxd/ublox_msg.h
index a52a7db3e5..4eafeac2ca 100644
--- a/system/ubloxd/ublox_msg.h
+++ b/system/ubloxd/ublox_msg.h
@@ -2,10 +2,11 @@
 
 #include <cassert>
 #include <cstdint>
+#include <ctime>
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <ctime>
+#include <utility>
 
 #include "cereal/messaging/messaging.h"
 #include "common/util.h"
diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc
index 6aac56cc78..bd43c337bd 100644
--- a/tools/cabana/binaryview.cc
+++ b/tools/cabana/binaryview.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/binaryview.h"
 
+#include <algorithm>
+
 #include <QFontDatabase>
 #include <QHeaderView>
 #include <QMouseEvent>
diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h
index 161b2aad8a..04e1d5b2af 100644
--- a/tools/cabana/binaryview.h
+++ b/tools/cabana/binaryview.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <tuple>
+#include <vector>
+
 #include <QList>
 #include <QSet>
 #include <QStyledItemDelegate>
diff --git a/tools/cabana/chart/chart.cc b/tools/cabana/chart/chart.cc
index 08e8b54b73..18a9adbe07 100644
--- a/tools/cabana/chart/chart.cc
+++ b/tools/cabana/chart/chart.cc
@@ -1,5 +1,8 @@
 #include "tools/cabana/chart/chart.h"
 
+#include <algorithm>
+#include <limits>
+
 #include <QActionGroup>
 #include <QApplication>
 #include <QDrag>
diff --git a/tools/cabana/chart/chart.h b/tools/cabana/chart/chart.h
index 272ea0d193..2740d81b66 100644
--- a/tools/cabana/chart/chart.h
+++ b/tools/cabana/chart/chart.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <tuple>
+#include <utility>
+
 #include <QGraphicsPixmapItem>
 #include <QGraphicsProxyWidget>
 #include <QtCharts/QChartView>
diff --git a/tools/cabana/chart/chartswidget.cc b/tools/cabana/chart/chartswidget.cc
index ebc463af0e..e852e6d206 100644
--- a/tools/cabana/chart/chartswidget.cc
+++ b/tools/cabana/chart/chartswidget.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/chart/chartswidget.h"
 
+#include <algorithm>
+
 #include <QApplication>
 #include <QFutureSynchronizer>
 #include <QMenu>
diff --git a/tools/cabana/chart/chartswidget.h b/tools/cabana/chart/chartswidget.h
index 0d9f79062a..88ba4226c0 100644
--- a/tools/cabana/chart/chartswidget.h
+++ b/tools/cabana/chart/chartswidget.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <unordered_map>
+#include <utility>
+
 #include <QGridLayout>
 #include <QLabel>
 #include <QScrollArea>
diff --git a/tools/cabana/chart/sparkline.cc b/tools/cabana/chart/sparkline.cc
index baedee8bb2..4692b41e4b 100644
--- a/tools/cabana/chart/sparkline.cc
+++ b/tools/cabana/chart/sparkline.cc
@@ -1,5 +1,6 @@
 #include "tools/cabana/chart/sparkline.h"
 
+#include <limits>
 #include <QPainter>
 
 #include "tools/cabana/streams/abstractstream.h"
diff --git a/tools/cabana/chart/sparkline.h b/tools/cabana/chart/sparkline.h
index 2061966ebb..21cbd40a3f 100644
--- a/tools/cabana/chart/sparkline.h
+++ b/tools/cabana/chart/sparkline.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <algorithm>
+
 #include <QPixmap>
 #include <QPointF>
 #include <vector>
diff --git a/tools/cabana/chart/tiplabel.cc b/tools/cabana/chart/tiplabel.cc
index f34d7e8dfe..f5c9cc9cbd 100644
--- a/tools/cabana/chart/tiplabel.cc
+++ b/tools/cabana/chart/tiplabel.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/chart/tiplabel.h"
 
+#include <utility>
+
 #include <QApplication>
 #include <QStylePainter>
 #include <QToolTip>
diff --git a/tools/cabana/commands.h b/tools/cabana/commands.h
index a1e667807e..c7f59c4c7f 100644
--- a/tools/cabana/commands.h
+++ b/tools/cabana/commands.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include <QUndoCommand>
 #include <QUndoStack>
 
diff --git a/tools/cabana/dbc/dbc.cc b/tools/cabana/dbc/dbc.cc
index 691a1c4fb8..537749e48d 100644
--- a/tools/cabana/dbc/dbc.cc
+++ b/tools/cabana/dbc/dbc.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/dbc/dbc.h"
 
+#include <algorithm>
+
 #include "tools/cabana/util.h"
 
 uint qHash(const MessageId &item) {
diff --git a/tools/cabana/dbc/dbc.h b/tools/cabana/dbc/dbc.h
index 6a3084d943..e44bc41abf 100644
--- a/tools/cabana/dbc/dbc.h
+++ b/tools/cabana/dbc/dbc.h
@@ -1,10 +1,14 @@
 #pragma once
 
+#include <limits>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <QColor>
 #include <QList>
 #include <QMetaType>
 #include <QString>
-#include <limits>
 
 #include "opendbc/can/common_dbc.h"
 
diff --git a/tools/cabana/dbc/dbcmanager.h b/tools/cabana/dbc/dbcmanager.h
index f20d4888e2..3ac0829487 100644
--- a/tools/cabana/dbc/dbcmanager.h
+++ b/tools/cabana/dbc/dbcmanager.h
@@ -3,6 +3,7 @@
 #include <memory>
 #include <map>
 #include <set>
+#include <vector>
 
 #include "tools/cabana/dbc/dbcfile.h"
 
diff --git a/tools/cabana/historylog.cc b/tools/cabana/historylog.cc
index cf9dea88db..2b57e9d007 100644
--- a/tools/cabana/historylog.cc
+++ b/tools/cabana/historylog.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/historylog.h"
 
+#include <functional>
+
 #include <QPainter>
 #include <QPushButton>
 #include <QVBoxLayout>
diff --git a/tools/cabana/historylog.h b/tools/cabana/historylog.h
index 2dea698f68..a68fbdbf43 100644
--- a/tools/cabana/historylog.h
+++ b/tools/cabana/historylog.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <deque>
+#include <vector>
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QHeaderView>
diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc
index fa91095706..d3caf492a6 100644
--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@@ -1,6 +1,9 @@
 #include "tools/cabana/mainwin.h"
 
+#include <algorithm>
 #include <iostream>
+#include <string>
+
 #include <QClipboard>
 #include <QDesktopWidget>
 #include <QFile>
diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc
index fe4c7afb03..795683a9d0 100644
--- a/tools/cabana/messageswidget.cc
+++ b/tools/cabana/messageswidget.cc
@@ -1,4 +1,10 @@
 #include "tools/cabana/messageswidget.h"
+
+#include <algorithm>
+#include <limits>
+#include <utility>
+#include <vector>
+
 #include <QHBoxLayout>
 #include <QPainter>
 #include <QPushButton>
diff --git a/tools/cabana/messageswidget.h b/tools/cabana/messageswidget.h
index 2e165f5b7c..f6d71a5a2e 100644
--- a/tools/cabana/messageswidget.h
+++ b/tools/cabana/messageswidget.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <algorithm>
+#include <utility>
+#include <vector>
+
 #include <QAbstractTableModel>
 #include <QCheckBox>
 #include <QContextMenuEvent>
diff --git a/tools/cabana/signalview.cc b/tools/cabana/signalview.cc
index ce10576ffe..1b1c8dac22 100644
--- a/tools/cabana/signalview.cc
+++ b/tools/cabana/signalview.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/signalview.h"
 
+#include <algorithm>
+
 #include <QCompleter>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
diff --git a/tools/cabana/signalview.h b/tools/cabana/signalview.h
index 9541ac8a3b..5cab7f8fa0 100644
--- a/tools/cabana/signalview.h
+++ b/tools/cabana/signalview.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include <QAbstractItemModel>
 #include <QLabel>
 #include <QLineEdit>
diff --git a/tools/cabana/streams/abstractstream.cc b/tools/cabana/streams/abstractstream.cc
index 7cd210d8f1..1d35e96c99 100644
--- a/tools/cabana/streams/abstractstream.cc
+++ b/tools/cabana/streams/abstractstream.cc
@@ -1,5 +1,8 @@
 #include "tools/cabana/streams/abstractstream.h"
 
+#include <algorithm>
+#include <vector>
+
 #include <QTimer>
 
 AbstractStream *can = nullptr;
diff --git a/tools/cabana/streams/abstractstream.h b/tools/cabana/streams/abstractstream.h
index 5cafa58cb8..e883f45d46 100644
--- a/tools/cabana/streams/abstractstream.h
+++ b/tools/cabana/streams/abstractstream.h
@@ -3,7 +3,11 @@
 #include <array>
 #include <atomic>
 #include <deque>
+#include <memory>
+#include <tuple>
 #include <unordered_map>
+#include <vector>
+
 #include <QColor>
 #include <QHash>
 
diff --git a/tools/cabana/streams/devicestream.cc b/tools/cabana/streams/devicestream.cc
index 5631f64d68..349a2d7a1c 100644
--- a/tools/cabana/streams/devicestream.cc
+++ b/tools/cabana/streams/devicestream.cc
@@ -1,5 +1,8 @@
 #include "tools/cabana/streams/devicestream.h"
 
+#include <memory>
+#include <string>
+
 #include <QButtonGroup>
 #include <QFormLayout>
 #include <QRadioButton>
diff --git a/tools/cabana/streams/livestream.cc b/tools/cabana/streams/livestream.cc
index 91c88c97ca..3f8397f56c 100644
--- a/tools/cabana/streams/livestream.cc
+++ b/tools/cabana/streams/livestream.cc
@@ -1,5 +1,8 @@
 #include "tools/cabana/streams/livestream.h"
 
+#include <algorithm>
+#include <memory>
+
 struct LiveStream::Logger {
   Logger() : start_ts(seconds_since_epoch()), segment_num(-1) {}
 
diff --git a/tools/cabana/streams/livestream.h b/tools/cabana/streams/livestream.h
index b4816d090f..38ef2c67f9 100644
--- a/tools/cabana/streams/livestream.h
+++ b/tools/cabana/streams/livestream.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <deque>
+#include <memory>
+#include <vector>
+
 #include <QBasicTimer>
 
 #include "tools/cabana/streams/abstractstream.h"
diff --git a/tools/cabana/streams/pandastream.cc b/tools/cabana/streams/pandastream.cc
index e19b2450bd..4a6c588e51 100644
--- a/tools/cabana/streams/pandastream.cc
+++ b/tools/cabana/streams/pandastream.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/streams/pandastream.h"
 
+#include <vector>
+
 #include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/tools/cabana/streams/pandastream.h b/tools/cabana/streams/pandastream.h
index 49e1836c2d..43803950f9 100644
--- a/tools/cabana/streams/pandastream.h
+++ b/tools/cabana/streams/pandastream.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include <QComboBox>
 #include <QFormLayout>
 #include <QVBoxLayout>
diff --git a/tools/cabana/streams/replaystream.h b/tools/cabana/streams/replaystream.h
index eddcf514f7..de69d9e86c 100644
--- a/tools/cabana/streams/replaystream.h
+++ b/tools/cabana/streams/replaystream.h
@@ -1,5 +1,11 @@
 #pragma once
 
+#include <algorithm>
+#include <memory>
+#include <set>
+#include <tuple>
+#include <vector>
+
 #include "common/prefix.h"
 #include "tools/cabana/streams/abstractstream.h"
 
diff --git a/tools/cabana/streams/socketcanstream.h b/tools/cabana/streams/socketcanstream.h
index 9d34aaebac..6f2d7aa353 100644
--- a/tools/cabana/streams/socketcanstream.h
+++ b/tools/cabana/streams/socketcanstream.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include <QtSerialBus/QCanBus>
 #include <QtSerialBus/QCanBusDevice>
 #include <QtSerialBus/QCanBusDeviceInfo>
diff --git a/tools/cabana/tools/findsignal.h b/tools/cabana/tools/findsignal.h
index f046bdf7e3..e9e5f9f180 100644
--- a/tools/cabana/tools/findsignal.h
+++ b/tools/cabana/tools/findsignal.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <algorithm>
+#include <limits>
+
 #include <QAbstractTableModel>
 #include <QLabel>
 #include <QPushButton>
diff --git a/tools/cabana/tools/findsimilarbits.cc b/tools/cabana/tools/findsimilarbits.cc
index 72429104a5..c3c659791a 100644
--- a/tools/cabana/tools/findsimilarbits.cc
+++ b/tools/cabana/tools/findsimilarbits.cc
@@ -1,5 +1,7 @@
 #include "tools/cabana/tools/findsimilarbits.h"
 
+#include <algorithm>
+
 #include <QGridLayout>
 #include <QHeaderView>
 #include <QHBoxLayout>
diff --git a/tools/cabana/util.cc b/tools/cabana/util.cc
index 31a4486772..278e776e9c 100644
--- a/tools/cabana/util.cc
+++ b/tools/cabana/util.cc
@@ -1,7 +1,10 @@
 #include "tools/cabana/util.h"
 
+#include <algorithm>
 #include <array>
 #include <csignal>
+#include <limits>
+#include <string>
 #include <sys/socket.h>
 #include <unistd.h>
 
diff --git a/tools/cabana/util.h b/tools/cabana/util.h
index 76238569f0..696319b3a8 100644
--- a/tools/cabana/util.h
+++ b/tools/cabana/util.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <cmath>
+#include <vector>
+#include <utility>
 
 #include <QApplication>
 #include <QByteArray>
diff --git a/tools/cabana/videowidget.cc b/tools/cabana/videowidget.cc
index 46642e5244..f535c6b729 100644
--- a/tools/cabana/videowidget.cc
+++ b/tools/cabana/videowidget.cc
@@ -1,5 +1,10 @@
 #include "tools/cabana/videowidget.h"
 
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <QButtonGroup>
 #include <QHBoxLayout>
 #include <QMouseEvent>
diff --git a/tools/cabana/videowidget.h b/tools/cabana/videowidget.h
index 670e866534..7ddd315e48 100644
--- a/tools/cabana/videowidget.h
+++ b/tools/cabana/videowidget.h
@@ -1,7 +1,11 @@
 #pragma once
 
 #include <atomic>
+#include <map>
+#include <memory>
 #include <mutex>
+#include <tuple>
+#include <vector>
 
 #include <QFuture>
 #include <QLabel>
diff --git a/tools/replay/camera.h b/tools/replay/camera.h
index 66d33142fb..f2d19ccfb2 100644
--- a/tools/replay/camera.h
+++ b/tools/replay/camera.h
@@ -1,6 +1,10 @@
 #pragma once
 
 #include <unistd.h>
+
+#include <memory>
+#include <utility>
+
 #include "cereal/visionipc/visionipc_server.h"
 #include "common/queue.h"
 #include "tools/replay/framereader.h"
diff --git a/tools/replay/consoleui.cc b/tools/replay/consoleui.cc
index 5cbd3818a6..719bbd69ca 100644
--- a/tools/replay/consoleui.cc
+++ b/tools/replay/consoleui.cc
@@ -1,7 +1,11 @@
 #include "tools/replay/consoleui.h"
 
-#include <QApplication>
 #include <initializer_list>
+#include <string>
+#include <tuple>
+#include <utility>
+
+#include <QApplication>
 
 #include "common/version.h"
 
diff --git a/tools/replay/framereader.cc b/tools/replay/framereader.cc
index ed276c627c..3083a0d376 100644
--- a/tools/replay/framereader.cc
+++ b/tools/replay/framereader.cc
@@ -2,6 +2,7 @@
 #include "tools/replay/util.h"
 
 #include <cassert>
+#include <algorithm>
 #include "libyuv.h"
 
 #include "cereal/visionipc/visionbuf.h"
diff --git a/tools/replay/logreader.h b/tools/replay/logreader.h
index 1aa8c98b45..77d751a91b 100644
--- a/tools/replay/logreader.h
+++ b/tools/replay/logreader.h
@@ -5,7 +5,10 @@
 #include <memory_resource>
 #endif
 
+#include <memory>
 #include <set>
+#include <string>
+#include <vector>
 
 #include "cereal/gen/cpp/log.capnp.h"
 #include "system/camerad/cameras/camera_common.h"
diff --git a/tools/replay/replay.h b/tools/replay/replay.h
index 1792702957..5ed4ff11b5 100644
--- a/tools/replay/replay.h
+++ b/tools/replay/replay.h
@@ -1,6 +1,14 @@
 #pragma once
 
+#include <algorithm>
+#include <map>
+#include <memory>
 #include <optional>
+#include <set>
+#include <string>
+#include <tuple>
+#include <vector>
+#include <utility>
 
 #include <QThread>
 
diff --git a/tools/replay/route.cc b/tools/replay/route.cc
index 619aeb3f5f..15a57e5e42 100644
--- a/tools/replay/route.cc
+++ b/tools/replay/route.cc
@@ -6,11 +6,13 @@
 #include <QJsonDocument>
 #include <QRegExp>
 #include <QtConcurrent>
-
 #include <array>
+#include <memory>
+#include <set>
+#include <string>
 
-#include "system/hardware/hw.h"
 #include "selfdrive/ui/qt/api.h"
+#include "system/hardware/hw.h"
 #include "tools/replay/replay.h"
 #include "tools/replay/util.h"
 
diff --git a/tools/replay/route.h b/tools/replay/route.h
index 86adf6a14d..7207ff4f5c 100644
--- a/tools/replay/route.h
+++ b/tools/replay/route.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+
 #include <QDateTime>
 #include <QFutureSynchronizer>
 
diff --git a/tools/replay/util.cc b/tools/replay/util.cc
index a6ebbec615..172d545c75 100644
--- a/tools/replay/util.cc
+++ b/tools/replay/util.cc
@@ -9,8 +9,10 @@
 #include <cmath>
 #include <fstream>
 #include <iostream>
+#include <map>
 #include <mutex>
 #include <numeric>
+#include <utility>
 
 #include "common/timing.h"
 #include "common/util.h"