From cf7b9ee186d4ef8e5da0531b75854c97b821be44 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Fri, 21 Oct 2016 01:25:52 +0200
Subject: [PATCH] Re-run include-what-you-use.

Insignificant compile-time savings this time, but still nice
to have it cleaned up.
---
 aboutdialog.cpp           |  2 ++
 aboutdialog.h             |  6 ++---
 alsa_input.cpp            |  1 +
 alsa_input.h              |  6 +----
 alsa_output.cpp           |  4 +++
 alsa_output.h             |  1 -
 alsa_pool.cpp             | 11 +++++---
 alsa_pool.h               |  7 +----
 audio_encoder.cpp         | 10 ++++++--
 audio_encoder.h           |  7 +++--
 audio_mixer.cpp           | 18 ++++++++-----
 audio_mixer.h             | 10 +++++---
 benchmark_audio_mixer.cpp | 13 ++++++++--
 context.cpp               |  3 +--
 correlation_measurer.cpp  |  4 +--
 correlation_meter.cpp     | 11 ++++++--
 correlation_meter.h       | 10 ++++++--
 decklink_capture.cpp      | 18 +++++++------
 decklink_capture.h        |  7 ++++-
 disk_space_estimator.cpp  |  9 ++++---
 disk_space_estimator.h    |  2 +-
 ebu_r128_proc.cc          |  5 ++--
 ffmpeg_raii.cpp           |  2 ++
 filter.cpp                |  6 +++--
 filter.h                  |  9 +------
 glwidget.cpp              | 34 ++++++++++++------------
 glwidget.h                |  7 ++---
 httpd.cpp                 | 15 +++++------
 httpd.h                   |  2 --
 image_input.cpp           | 20 ++++++++++++---
 image_input.h             |  9 ++++---
 input_mapping.cpp         | 13 +++++-----
 input_mapping_dialog.cpp  | 24 ++++++++++++++---
 input_mapping_dialog.h    |  8 +++---
 lrameter.cpp              |  3 +++
 lrameter.h                |  8 ++++--
 main.cpp                  |  4 +--
 mainwindow.cpp            | 54 +++++++++++++++++++++++++++++----------
 mainwindow.h              | 11 +++++---
 metacube2.cpp             |  3 ++-
 midi_mapper.cpp           | 21 ++++++++++-----
 midi_mapping_dialog.cpp   | 23 ++++++++++++-----
 midi_mapping_dialog.h     | 11 +++++---
 mixer.cpp                 | 13 ++++++----
 mixer.h                   | 14 +++-------
 mux.cpp                   | 19 ++++++++++++--
 mux.h                     |  4 +--
 nonlinear_fader.cpp       | 17 +++++++-----
 nonlinear_fader.h         |  6 +++++
 pbo_frame_allocator.cpp   |  4 +--
 pbo_frame_allocator.h     |  1 +
 quicksync_encoder.h       |  4 ---
 ref_counted_frame.cpp     |  2 ++
 resampling_queue.cpp      |  7 +++--
 resampling_queue.h        |  2 --
 stereocompressor.cpp      |  6 ++---
 stereocompressor.h        |  3 +--
 theme.cpp                 | 13 +++++++---
 theme.h                   | 13 ++++------
 video_encoder.cpp         | 16 ++++++++++--
 video_encoder.h           | 16 +++++++++---
 vu_common.cpp             |  6 ++---
 vu_common.h               |  2 +-
 vumeter.cpp               |  8 ++++--
 vumeter.h                 |  8 ++++--
 x264_encoder.cpp          |  8 +++++-
 x264_encoder.h            |  6 ++---
 x264_speed_control.cpp    | 12 ++++++---
 x264_speed_control.h      |  3 ---
 69 files changed, 428 insertions(+), 237 deletions(-)

diff --git a/aboutdialog.cpp b/aboutdialog.cpp
index 6b74aec..94ef345 100644
--- a/aboutdialog.cpp
+++ b/aboutdialog.cpp
@@ -1,5 +1,7 @@
 #include "aboutdialog.h"
 
+#include <QDialogButtonBox>
+
 #include "ui_aboutdialog.h"
 
 using namespace std;
diff --git a/aboutdialog.h b/aboutdialog.h
index 980dc83..5100c00 100644
--- a/aboutdialog.h
+++ b/aboutdialog.h
@@ -2,11 +2,9 @@
 #define _ABOUTDIALOG_H 1
 
 #include <QDialog>
-#include <string>
-#include <vector>
-#include <sys/time.h>
+#include <QString>
 
-#include "mixer.h"
+class QObject;
 
 namespace Ui {
 class AboutDialog;
diff --git a/alsa_input.cpp b/alsa_input.cpp
index ff726f0..158bfaa 100644
--- a/alsa_input.cpp
+++ b/alsa_input.cpp
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <cstdint>
 
 #include "alsa_pool.h"
 #include "bmusb/bmusb.h"
diff --git a/alsa_input.h b/alsa_input.h
index b08d47a..6bce913 100644
--- a/alsa_input.h
+++ b/alsa_input.h
@@ -10,21 +10,17 @@
 // as a whole, since that's what AudioMixer::add_audio() wants.
 
 #include <alsa/asoundlib.h>
-#include <alsa/pcm.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <atomic>
 #include <functional>
+#include <memory>
 #include <string>
 #include <thread>
-#include <unordered_map>
-#include <vector>
 
 #include "bmusb/bmusb.h"
-#include "timebase.h"
 
 class ALSAPool;
-class DeviceSpecProto;
 
 class ALSAInput {
 public:
diff --git a/alsa_output.cpp b/alsa_output.cpp
index d5ee35f..7dd1024 100644
--- a/alsa_output.cpp
+++ b/alsa_output.cpp
@@ -1,5 +1,9 @@
 #include "alsa_output.h"
 
+#include <alsa/asoundlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <vector>
 
 using namespace std;
diff --git a/alsa_output.h b/alsa_output.h
index 90223b7..3d1d2ca 100644
--- a/alsa_output.h
+++ b/alsa_output.h
@@ -9,7 +9,6 @@
 // probably drift out of sync enough to make a little pop.
 
 #include <alsa/asoundlib.h>
-
 #include <vector>
 
 class ALSAOutput {
diff --git a/alsa_pool.cpp b/alsa_pool.cpp
index 0a7da59..3b6dd7e 100644
--- a/alsa_pool.cpp
+++ b/alsa_pool.cpp
@@ -1,16 +1,21 @@
 #include "alsa_pool.h"
 
-#include <alsa/control.h>
-#include <alsa/error.h>
-#include <alsa/pcm.h>
+#include <alsa/asoundlib.h>
 #include <assert.h>
+#include <errno.h>
 #include <limits.h>
+#include <poll.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <sys/eventfd.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <algorithm>
+#include <chrono>
+#include <functional>
+#include <iterator>
 #include <memory>
+#include <ratio>
 
 #include "alsa_input.h"
 #include "audio_mixer.h"
diff --git a/alsa_pool.h b/alsa_pool.h
index 7bab808..904e2ec 100644
--- a/alsa_pool.h
+++ b/alsa_pool.h
@@ -1,19 +1,14 @@
 #ifndef _ALSA_POOL_H
 #define _ALSA_POOL_H 1
 
-#include <alsa/asoundlib.h>
 #include <atomic>
-#include <functional>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 
-#include "alsa_input.h"
-#include "bmusb/bmusb.h"
-#include "timebase.h"
-
 class ALSAInput;
 class DeviceSpecProto;
 
diff --git a/audio_encoder.cpp b/audio_encoder.cpp
index 578b0c2..aa343da 100644
--- a/audio_encoder.cpp
+++ b/audio_encoder.cpp
@@ -5,18 +5,24 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavresample/avresample.h>
 #include <libavutil/channel_layout.h>
+#include <libavutil/error.h>
 #include <libavutil/frame.h>
+#include <libavutil/mem.h>
+#include <libavutil/opt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
-#include <libavutil/opt.h>
 }
 
 #include <assert.h>
-
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "defs.h"
+#include "mux.h"
 #include "timebase.h"
 
 using namespace std;
diff --git a/audio_encoder.h b/audio_encoder.h
index 7bdb02a..93adbaf 100644
--- a/audio_encoder.h
+++ b/audio_encoder.h
@@ -3,18 +3,21 @@
 #ifndef _AUDIO_ENCODER_H
 #define _AUDIO_ENCODER_H 1
 
-#include <memory>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #include <libavresample/avresample.h>
 #include <libavutil/frame.h>
 }
 
 #include "ffmpeg_raii.h"
-#include "mux.h"
+
+class Mux;
 
 class AudioEncoder {
 public:
diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 46ae44c..13532e2 100644
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -1,19 +1,25 @@
 #include "audio_mixer.h"
 
 #include <assert.h>
-#include <endian.h>
 #include <bmusb/bmusb.h>
-#include <stdio.h>
 #include <endian.h>
-#include <cmath>
-#include <limits>
-#ifdef __SSE__
+#include <math.h>
+#ifdef __SSE2__
 #include <immintrin.h>
 #endif
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <cstddef>
+#include <limits>
+#include <utility>
 
 #include "db.h"
 #include "flags.h"
-#include "mixer.h"
 #include "state.pb.h"
 #include "timebase.h"
 
diff --git a/audio_mixer.h b/audio_mixer.h
index 8211710..85f9aed 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -8,19 +8,19 @@
 //
 // All operations on AudioMixer (except destruction) are thread-safe.
 
-#include <math.h>
+#include <assert.h>
 #include <stdint.h>
+#include <zita-resampler/resampler.h>
 #include <atomic>
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <set>
+#include <string>
 #include <vector>
-#include <zita-resampler/resampler.h>
 
-#include "alsa_input.h"
 #include "alsa_pool.h"
-#include "bmusb/bmusb.h"
 #include "correlation_measurer.h"
 #include "db.h"
 #include "defs.h"
@@ -30,6 +30,8 @@
 #include "resampling_queue.h"
 #include "stereocompressor.h"
 
+class DeviceSpecProto;
+
 namespace bmusb {
 struct AudioFormat;
 }  // namespace bmusb
diff --git a/benchmark_audio_mixer.cpp b/benchmark_audio_mixer.cpp
index 8fe4710..4b8f84a 100644
--- a/benchmark_audio_mixer.cpp
+++ b/benchmark_audio_mixer.cpp
@@ -2,12 +2,21 @@
 // with the default settings, feeds some white noise to the inputs and
 // runs a while. Useful for e.g. profiling.
 
-#include <stdio.h>
+#include <assert.h>
+#include <bmusb/bmusb.h>
 #include <stdint.h>
-#include <vector>
+#include <stdio.h>
+#include <algorithm>
 #include <chrono>
+#include <cmath>
+#include <ratio>
+#include <vector>
+
 #include "audio_mixer.h"
 #include "db.h"
+#include "defs.h"
+#include "input_mapping.h"
+#include "resampling_queue.h"
 #include "timebase.h"
 
 #define NUM_BENCHMARK_CARDS 4
diff --git a/context.cpp b/context.cpp
index 4736b82..36fa2ea 100644
--- a/context.cpp
+++ b/context.cpp
@@ -3,10 +3,9 @@
 #include <QGL>
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
+#include <QSurface>
 #include <QSurfaceFormat>
 
-class QSurface;
-
 QGLWidget *global_share_widget = nullptr;
 
 QSurface *create_surface(const QSurfaceFormat &format)
diff --git a/correlation_measurer.cpp b/correlation_measurer.cpp
index 1e8ff75..d0150a0 100644
--- a/correlation_measurer.cpp
+++ b/correlation_measurer.cpp
@@ -19,8 +19,8 @@
 #include "correlation_measurer.h"
 
 #include <assert.h>
-#include <stdint.h>
-#include <math.h>
+#include <cmath>
+#include <cstddef>
 
 using namespace std;
 
diff --git a/correlation_meter.cpp b/correlation_meter.cpp
index 005a1e2..7b7683a 100644
--- a/correlation_meter.cpp
+++ b/correlation_meter.cpp
@@ -1,8 +1,15 @@
-#include <QPainter>
+#include "correlation_meter.h"
 
 #include <math.h>
+#include <algorithm>
 
-#include "correlation_meter.h"
+#include <QBrush>
+#include <QColor>
+#include <QPainter>
+#include <QRect>
+
+class QPaintEvent;
+class QResizeEvent;
 
 using namespace std;
 
diff --git a/correlation_meter.h b/correlation_meter.h
index 6dc0684..ea01e04 100644
--- a/correlation_meter.h
+++ b/correlation_meter.h
@@ -1,10 +1,16 @@
 #ifndef CORRELATION_METER_H
 #define CORRELATION_METER_H
 
-#include <QPaintEvent>
-#include <QWidget>
 #include <mutex>
 
+#include <QPixmap>
+#include <QString>
+#include <QWidget>
+
+class QObject;
+class QPaintEvent;
+class QResizeEvent;
+
 class CorrelationMeter : public QWidget
 {
 	Q_OBJECT
diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index 81566cb..505083f 100644
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -1,19 +1,21 @@
 #include "decklink_capture.h"
 
+#include <DeckLinkAPI.h>
+#include <DeckLinkAPIConfiguration.h>
+#include <DeckLinkAPIDiscovery.h>
+#include <DeckLinkAPIModes.h>
 #include <assert.h>
+#ifdef __SSE2__
+#include <immintrin.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cstddef>
-#ifdef __SSE2__
-#include <immintrin.h>
-#endif
+#include <cstdint>
+#include <utility>
+#include <vector>
 
-#include <DeckLinkAPI.h>
-#include <DeckLinkAPIConfiguration.h>
-#include <DeckLinkAPIDiscovery.h>
-#include <DeckLinkAPIModes.h>
 #include "bmusb/bmusb.h"
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.
diff --git a/decklink_capture.h b/decklink_capture.h
index 0a9c37b..05eb4a8 100644
--- a/decklink_capture.h
+++ b/decklink_capture.h
@@ -5,12 +5,17 @@
 #include <stdint.h>
 #include <atomic>
 #include <functional>
+#include <map>
+#include <memory>
 #include <string>
 
+#include "DeckLinkAPIModes.h"
+#include "DeckLinkAPITypes.h"
+#include "LinuxCOM.h"
 #include "bmusb/bmusb.h"
 
 class IDeckLink;
-class IDeckLinkDisplayMode;
+class IDeckLinkConfiguration;
 
 // TODO: Adjust CaptureInterface to be a little less bmusb-centric.
 // There are too many member functions here that don't really do anything.
diff --git a/disk_space_estimator.cpp b/disk_space_estimator.cpp
index 1cb7d6f..cacc811 100644
--- a/disk_space_estimator.cpp
+++ b/disk_space_estimator.cpp
@@ -1,9 +1,10 @@
+#include "disk_space_estimator.h"
+
+#include <stdio.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/vfs.h>
-#include <unistd.h>
+#include <sys/statfs.h>
+#include <memory>
 
-#include "disk_space_estimator.h"
 #include "timebase.h"
 
 DiskSpaceEstimator::DiskSpaceEstimator(DiskSpaceEstimator::callback_t callback)
diff --git a/disk_space_estimator.h b/disk_space_estimator.h
index b585bc3..2acd4be 100644
--- a/disk_space_estimator.h
+++ b/disk_space_estimator.h
@@ -10,7 +10,7 @@
 // The bitrate is measured over a simple 30-second sliding window.
 
 #include <stdint.h>
-
+#include <sys/types.h>
 #include <deque>
 #include <functional>
 #include <string>
diff --git a/ebu_r128_proc.cc b/ebu_r128_proc.cc
index d480ce0..f062eaf 100644
--- a/ebu_r128_proc.cc
+++ b/ebu_r128_proc.cc
@@ -19,10 +19,11 @@
 // ------------------------------------------------------------------------
 
 
-#include <string.h>
-#include <math.h>
 #include "ebu_r128_proc.h"
 
+#include <string.h>
+#include <cmath>
+
 
 float Ebu_r128_hist::_bin_power [100] = { 0.0f };
 float Ebu_r128_proc::_chan_gain [5] = { 1.0f, 1.0f, 1.0f, 1.41f, 1.41f };
diff --git a/ffmpeg_raii.cpp b/ffmpeg_raii.cpp
index 0429597..74ea3fd 100644
--- a/ffmpeg_raii.cpp
+++ b/ffmpeg_raii.cpp
@@ -3,6 +3,8 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/dict.h>
+#include <libavutil/frame.h>
 }
 
 using namespace std;
diff --git a/filter.cpp b/filter.cpp
index c6f9997..0cb0180 100644
--- a/filter.cpp
+++ b/filter.cpp
@@ -1,9 +1,11 @@
+#include <assert.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
-#include <complex>
 #include <algorithm>
+#include <complex>
+
+#include "defs.h"
 
 #ifdef __SSE__
 #include <mmintrin.h>
diff --git a/filter.h b/filter.h
index a4a3a13..1bf18c9 100644
--- a/filter.h
+++ b/filter.h
@@ -10,20 +10,13 @@
 #define _FILTER_H 1
 
 #define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
+#include <cmath>
 #include <complex>
 
 #ifdef __SSE__
 #include <xmmintrin.h>
 #endif
 
-#include "defs.h"
-
-namespace std {
-template <typename _Tp> struct complex;
-}  // namespace std
-
 enum FilterType
 {
 	FILTER_NONE = 0,
diff --git a/glwidget.cpp b/glwidget.cpp
index 9d5e02c..3aa10fa 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -1,33 +1,31 @@
-#include <qmetatype.h>  // Needs to come before egl.h.
-#include <qdatastream.h>  // Needs to come before egl.h.
-#include <qtextstream.h>  // Needs to come before egl.h.
-#include <qcursor.h>  // Needs to come before egl.h.
-#include <qcoreevent.h>  // Needs to come before egl.h.
-#include <qevent.h>  // Needs to come before egl.h.
-#include <epoxy/gl.h>
-#include <epoxy/egl.h>
-#include <QAction>
-#include <QMenu>
-#include <QSurfaceFormat>
-
 #include "glwidget.h"
 
-#include <stdio.h>
-#include <functional>
-#include <limits>
-#include <mutex>
+#include <assert.h>
+#include <bmusb/bmusb.h>
 #include <movit/effect_chain.h>
 #include <movit/resource_pool.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <QAction>
+#include <QActionGroup>
+#include <QList>
+#include <QMenu>
+#include <QPoint>
+#include <QVariant>
+#include <QWidget>
+#include <functional>
+#include <map>
+#include <mutex>
+#include <utility>
 
+#include "audio_mixer.h"
 #include "context.h"
 #include "flags.h"
 #include "mainwindow.h"
 #include "mixer.h"
-#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
 
 class QMouseEvent;
-class QWidget;
 
 #undef Success
 #include <movit/util.h>
diff --git a/glwidget.h b/glwidget.h
index 3eb55da..f2eaea8 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,15 +2,16 @@
 #define GLWIDGET_H
 
 #include <epoxy/gl.h>
-#include <QGLWidget>
+#include <QGL>
+#include <QString>
 #include <string>
 #include <vector>
 
 #include "mixer.h"
-#include "qgl.h"
-#include "qobjectdefs.h"
 
 class QMouseEvent;
+class QObject;
+class QPoint;
 class QWidget;
 
 namespace movit {
diff --git a/httpd.cpp b/httpd.cpp
index 3fbab5d..858d952 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -1,19 +1,18 @@
-#include <arpa/inet.h>
+#include "httpd.h"
+
 #include <assert.h>
+#include <byteswap.h>
 #include <endian.h>
 #include <microhttpd.h>
+#include <netinet/in.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-
-#include <vector>
-
-#include "httpd.h"
+#include <sys/time.h>
+#include <time.h>
+#include <memory>
 
 #include "defs.h"
-#include "flags.h"
 #include "metacube2.h"
-#include "timebase.h"
 
 struct MHD_Connection;
 struct MHD_Response;
diff --git a/httpd.h b/httpd.h
index 73410fd..902745a 100644
--- a/httpd.h
+++ b/httpd.h
@@ -3,13 +3,11 @@
 
 // A class dealing with stream output to HTTP.
 
-#include <microhttpd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <condition_variable>
 #include <deque>
-#include <memory>
 #include <mutex>
 #include <set>
 #include <string>
diff --git a/image_input.cpp b/image_input.cpp
index b8e2b02..70bffb0 100644
--- a/image_input.cpp
+++ b/image_input.cpp
@@ -1,25 +1,39 @@
 #include "image_input.h"
 
+#include <errno.h>
 #include <movit/image_format.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/avutil.h>
+#include <libavutil/error.h>
+#include <libavutil/frame.h>
 #include <libavutil/imgutils.h>
+#include <libavutil/mem.h>
 #include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
 }
 
-#include <sys/types.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
-
+#include <cstddef>
+#include <functional>
 #include <mutex>
 #include <thread>
+#include <utility>
+#include <vector>
 
 #include "ffmpeg_raii.h"
 #include "flags.h"
+#include "flat_input.h"
+
+struct SwsContext;
 
 using namespace std;
 
diff --git a/image_input.h b/image_input.h
index 3b3c187..11c94ce 100644
--- a/image_input.h
+++ b/image_input.h
@@ -1,16 +1,17 @@
 #ifndef _IMAGE_INPUT_H
 #define _IMAGE_INPUT_H 1
 
+#include <epoxy/gl.h>
+#include <movit/flat_input.h>
+#include <stdbool.h>
+#include <time.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
-#include <time.h>
-
-#include <movit/flat_input.h>
-
 // An output that takes its input from a static image, loaded with ffmpeg.
 // comes from a single 2D array with chunky pixels. The image is refreshed
 // from disk about every second.
diff --git a/input_mapping.cpp b/input_mapping.cpp
index 4b28a59..deef923 100644
--- a/input_mapping.cpp
+++ b/input_mapping.cpp
@@ -1,13 +1,14 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "input_mapping.h"
 
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/io/zero_copy_stream.h>
+#include <assert.h>
+#include <fcntl.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/text_format.h>
+#include <stdio.h>
+#include <set>
+#include <utility>
 
 #include "audio_mixer.h" 
-#include "input_mapping.h"
 #include "state.pb.h"
 
 using namespace std;
diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index c81e292..f303280 100644
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -1,11 +1,29 @@
 #include "input_mapping_dialog.h"
 
-#include "post_to_main_thread.h"
-#include "ui_input_mapping.h"
-
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <QAbstractItemView>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFileDialog>
+#include <QHeaderView>
+#include <QList>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QVariant>
+#include <functional>
+#include <memory>
+#include <set>
+#include <string>
+#include <utility>
+
+#include "alsa_pool.h"
+#include "defs.h"
+#include "post_to_main_thread.h"
+#include "ui_input_mapping.h"
 
 using namespace std;
 using namespace std::placeholders;
diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h
index 3fa11e3..640644e 100644
--- a/input_mapping_dialog.h
+++ b/input_mapping_dialog.h
@@ -2,12 +2,14 @@
 #define _INPUT_MAPPING_DIALOG_H
 
 #include <QDialog>
-#include <string>
+#include <QString>
+#include <map>
 #include <vector>
-#include <sys/time.h>
 
 #include "audio_mixer.h"
-#include "mixer.h"
+#include "input_mapping.h"
+
+class QObject;
 
 namespace Ui {
 class InputMappingDialog;
diff --git a/lrameter.cpp b/lrameter.cpp
index 8121ee4..62b4a9f 100644
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -3,9 +3,12 @@
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
+#include <QRect>
+
 #include "vu_common.h"
 
 class QPaintEvent;
+class QResizeEvent;
 
 using namespace std;
 
diff --git a/lrameter.h b/lrameter.h
index 0b887f9..7a832df 100644
--- a/lrameter.h
+++ b/lrameter.h
@@ -2,13 +2,17 @@
 #define LRAMETER_H
 
 #include <math.h>
-#include <QLabel>
-#include <QPaintEvent>
+#include <QPixmap>
+#include <QString>
 #include <QWidget>
 #include <mutex>
 
 #include "vu_common.h"
 
+class QObject;
+class QPaintEvent;
+class QResizeEvent;
+
 class LRAMeter : public QWidget
 {
 	Q_OBJECT
diff --git a/main.cpp b/main.cpp
index 37ac4a4..e2d2cec 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,13 +5,13 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <epoxy/gl.h>
-
+#include <epoxy/gl.h>  // IWYU pragma: keep
 #include <QApplication>
 #include <QCoreApplication>
 #include <QGL>
 #include <QSize>
 #include <QSurfaceFormat>
+#include <string>
 
 #include "context.h"
 #include "flags.h"
diff --git a/mainwindow.cpp b/mainwindow.cpp
index eb78d0e..65a6125 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,42 +1,70 @@
 #include "mainwindow.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <assert.h>
 #include <signal.h>
-#include <algorithm>
-#include <chrono>
-#include <string>
-#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <QAbstractButton>
+#include <QAbstractSlider>
+#include <QAction>
+#include <QActionGroup>
+#include <QApplication>
 #include <QBoxLayout>
+#include <QCheckBox>
+#include <QDial>
+#include <QDialog>
+#include <QEvent>
+#include <QFlags>
+#include <QFrame>
+#include <QImage>
 #include <QInputDialog>
 #include <QKeySequence>
 #include <QLabel>
+#include <QLayoutItem>
+#include <QMenuBar>
 #include <QMessageBox>
-#include <QMetaType>
+#include <QMouseEvent>
+#include <QObject>
 #include <QPushButton>
-#include <QResizeEvent>
+#include <QRect>
+#include <QRgb>
 #include <QShortcut>
-#include <QSize>
-#include <QString>
+#include <QStackedWidget>
+#include <QToolButton>
+#include <QWidget>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <ratio>
+#include <string>
+#include <vector>
 
 #include "aboutdialog.h"
+#include "alsa_pool.h"
+#include "clickable_label.h"
+#include "correlation_meter.h"
 #include "disk_space_estimator.h"
+#include "ellipsis_label.h"
 #include "flags.h"
 #include "glwidget.h"
+#include "input_mapping.h"
 #include "input_mapping_dialog.h"
 #include "lrameter.h"
 #include "midi_mapping.pb.h"
 #include "midi_mapping_dialog.h"
 #include "mixer.h"
+#include "nonlinear_fader.h"
 #include "post_to_main_thread.h"
-#include "ui_audio_miniview.h"
 #include "ui_audio_expanded_view.h"
+#include "ui_audio_miniview.h"
 #include "ui_display.h"
 #include "ui_mainwindow.h"
 #include "vumeter.h"
 
-class QResizeEvent;
-
 using namespace std;
 using namespace std::chrono;
 using namespace std::placeholders;
diff --git a/mainwindow.h b/mainwindow.h
index 8dfbf83..a9dca41 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,18 +1,22 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include <stdbool.h>
+#include <sys/types.h>
 #include <QMainWindow>
+#include <QString>
 #include <chrono>
 #include <string>
 #include <vector>
-#include <sys/time.h>
 
+#include "audio_mixer.h"
 #include "midi_mapper.h"
 #include "mixer.h"
 
-class GLWidget;
-class Ui_AudioExpandedView;
+class QEvent;
+class QObject;
 class QResizeEvent;
+class Ui_AudioExpandedView;
 
 namespace Ui {
 class AudioExpandedView;
@@ -21,7 +25,6 @@ class Display;
 class MainWindow;
 }  // namespace Ui
 
-class QDial;
 class QLabel;
 class QPushButton;
 
diff --git a/metacube2.cpp b/metacube2.cpp
index 666355d..6b68132 100644
--- a/metacube2.cpp
+++ b/metacube2.cpp
@@ -7,7 +7,8 @@
 
 #include "metacube2.h"
 
-#include <arpa/inet.h>
+#include <byteswap.h>
+#include <netinet/in.h>
 
 /*
  * https://www.ece.cmu.edu/~koopman/pubs/KoopmanCRCWebinar9May2012.pdf
diff --git a/midi_mapper.cpp b/midi_mapper.cpp
index 8f43d21..4f0fb48 100644
--- a/midi_mapper.cpp
+++ b/midi_mapper.cpp
@@ -1,18 +1,25 @@
 #include "midi_mapper.h"
 
-#include "audio_mixer.h"
-#include "midi_mapping.pb.h"
-
 #include <alsa/asoundlib.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/text_format.h>
+#include <poll.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <sys/eventfd.h>
-
+#include <unistd.h>
+#include <algorithm>
 #include <functional>
 #include <thread>
 
+#include "audio_mixer.h"
+#include "midi_mapping.pb.h"
+
 using namespace google::protobuf;
 using namespace std;
 using namespace std::placeholders;
diff --git a/midi_mapping_dialog.cpp b/midi_mapping_dialog.cpp
index 9e5d11b..783a233 100644
--- a/midi_mapping_dialog.cpp
+++ b/midi_mapping_dialog.cpp
@@ -1,18 +1,29 @@
 #include "midi_mapping_dialog.h"
 
-#include "midi_mapper.h"
-#include "midi_mapping.pb.h"
-#include "post_to_main_thread.h"
-#include "ui_midi_mapping.h"
-
+#include <assert.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QSpinBox>
-
+#include <QStringList>
+#include <QTreeWidget>
+#include <stdio.h>
 #include <algorithm>
+#include <cstddef>
+#include <functional>
+#include <limits>
 #include <string>
 
+#include "midi_mapper.h"
+#include "midi_mapping.pb.h"
+#include "ui_midi_mapping.h"
+
+class QObject;
+
 using namespace google::protobuf;
 using namespace std;
 
diff --git a/midi_mapping_dialog.h b/midi_mapping_dialog.h
index a413ef1..5a1ec3f 100644
--- a/midi_mapping_dialog.h
+++ b/midi_mapping_dialog.h
@@ -1,21 +1,24 @@
 #ifndef _MIDI_MAPPING_DIALOG_H
 #define _MIDI_MAPPING_DIALOG_H
 
+#include <stdbool.h>
 #include <QDialog>
+#include <QString>
+#include <map>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
-#include <sys/time.h>
 
-#include "audio_mixer.h"
 #include "midi_mapper.h"
-#include "mixer.h"
+
+class QEvent;
+class QObject;
 
 namespace Ui {
 class MIDIMappingDialog;
 }  // namespace Ui
 
-class MIDIMapper;
 class MIDIMappingProto;
 class QComboBox;
 class QSpinBox;
diff --git a/mixer.cpp b/mixer.cpp
index aabc67e..780bd52 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -3,7 +3,6 @@
 #include "mixer.h"
 
 #include <assert.h>
-#include <endian.h>
 #include <epoxy/egl.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
@@ -16,33 +15,37 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
-#include <sys/time.h>
-#include <time.h>
 #include <algorithm>
 #include <chrono>
-#include <cmath>
 #include <condition_variable>
 #include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <mutex>
+#include <ratio>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
 
+#include "DeckLinkAPI.h"
+#include "LinuxCOM.h"
+#include "alsa_output.h"
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
 #include "context.h"
-#include "db.h"
 #include "decklink_capture.h"
 #include "defs.h"
 #include "disk_space_estimator.h"
 #include "flags.h"
+#include "input_mapping.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
+#include "resampling_queue.h"
 #include "timebase.h"
 #include "video_encoder.h"
 
+class IDeckLink;
 class QOpenGLContext;
 
 using namespace movit;
diff --git a/mixer.h b/mixer.h
index 39b259b..f5aa4fb 100644
--- a/mixer.h
+++ b/mixer.h
@@ -5,13 +5,11 @@
 
 #include <assert.h>
 #include <epoxy/gl.h>
+
 #undef Success
 
-#include <movit/effect_chain.h>
-#include <movit/flat_input.h>
 #include <stdbool.h>
 #include <stdint.h>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -25,34 +23,28 @@
 #include <thread>
 #include <vector>
 
-#include "alsa_output.h"
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
 #include "httpd.h"
 #include "input_state.h"
+#include "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "resampling_queue.h"
 #include "theme.h"
 #include "timebase.h"
-#include "stereocompressor.h"
 #include "video_encoder.h"
 
 class ALSAOutput;
 class QSurface;
-class QuickSyncEncoder;
+
 namespace movit {
 class Effect;
 class EffectChain;
 class FlatInput;
 class ResourcePool;
 }  // namespace movit
-
-namespace movit {
-class YCbCrInput;
-}
 class QSurfaceFormat;
 
 // For any card that's not the master (where we pick out the frames as they
diff --git a/mux.cpp b/mux.cpp
index 4f9f4d0..a7b3a7f 100644
--- a/mux.cpp
+++ b/mux.cpp
@@ -1,12 +1,27 @@
-#include <assert.h>
+#include "mux.h"
 
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <algorithm>
 #include <mutex>
 #include <string>
+#include <utility>
 #include <vector>
 
+extern "C" {
+#include <libavformat/avio.h>
+#include <libavutil/avutil.h>
+#include <libavutil/dict.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/mem.h>
+#include <libavutil/pixfmt.h>
+#include <libavutil/rational.h>
+}
+
 #include "defs.h"
-#include "mux.h"
 #include "timebase.h"
 
 using namespace std;
diff --git a/mux.h b/mux.h
index 3f5007d..ddf97fe 100644
--- a/mux.h
+++ b/mux.h
@@ -6,12 +6,12 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/avio.h>
 }
 
+#include <sys/types.h>
 #include <functional>
 #include <mutex>
-#include <queue>
+#include <string>
 #include <vector>
 
 class Mux {
diff --git a/nonlinear_fader.cpp b/nonlinear_fader.cpp
index 61317e0..4892c67 100644
--- a/nonlinear_fader.cpp
+++ b/nonlinear_fader.cpp
@@ -1,15 +1,18 @@
+#include "nonlinear_fader.h"
+
 #include <assert.h>
 #include <math.h>
-#include <stdio.h>
-#include <vector>
-#include <utility>
-
-#include <QResizeEvent>
 #include <QPainter>
+#include <QPoint>
+#include <QRect>
 #include <QStyle>
-#include <QStyleOptionSlider>
+#include <QStyleOption>
+#include <memory>
+#include <utility>
+#include <vector>
 
-#include "nonlinear_fader.h"
+class QPaintEvent;
+class QWidget;
 
 using namespace std;
 
diff --git a/nonlinear_fader.h b/nonlinear_fader.h
index cd844be..ce72852 100644
--- a/nonlinear_fader.h
+++ b/nonlinear_fader.h
@@ -1,7 +1,13 @@
 #ifndef _NONLINEAR_FADER_H
 #define _NONLINEAR_FADER_H 1
 
+#include <QAbstractSlider>
 #include <QSlider>
+#include <QString>
+
+class QObject;
+class QPaintEvent;
+class QWidget;
 
 class NonLinearFader : public QSlider {
 	Q_OBJECT
diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 34b2c7b..d18358a 100644
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,12 +1,12 @@
 #include "pbo_frame_allocator.h"
 
+#include <bmusb/bmusb.h>
+#include <movit/util.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
 
-#include <movit/util.h>
-
 using namespace std;
 
 PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 9220491..024e57a 100644
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -2,6 +2,7 @@
 #define _PBO_FRAME_ALLOCATOR 1
 
 #include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <memory>
 #include <mutex>
diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 16fd3d1..9e1e9f9 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -29,8 +29,6 @@
 #include <epoxy/gl.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <atomic>
-#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -39,10 +37,8 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
-#include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
-class AudioEncoder;
 class DiskSpaceEstimator;
 class Mux;
 class QSurface;
diff --git a/ref_counted_frame.cpp b/ref_counted_frame.cpp
index 3a30eac..0799017 100644
--- a/ref_counted_frame.cpp
+++ b/ref_counted_frame.cpp
@@ -1,5 +1,7 @@
 #include "ref_counted_frame.h"
 
+#include <bmusb/bmusb.h>
+
 void release_refcounted_frame(bmusb::FrameAllocator::Frame *frame)
 {
 	if (frame->owner) {
diff --git a/resampling_queue.cpp b/resampling_queue.cpp
index b7f898d..46fa910 100644
--- a/resampling_queue.cpp
+++ b/resampling_queue.cpp
@@ -20,11 +20,14 @@
 #include "resampling_queue.h"
 
 #include <assert.h>
-#include <math.h>
-#include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <zita-resampler/vresampler.h>
+#include <algorithm>
+#include <cmath>
+
+using namespace std;
 
 ResamplingQueue::ResamplingQueue(unsigned card_num, unsigned freq_in, unsigned freq_out, unsigned num_channels)
 	: card_num(card_num), freq_in(freq_in), freq_out(freq_out), num_channels(num_channels),
diff --git a/resampling_queue.h b/resampling_queue.h
index 339e41b..8462152 100644
--- a/resampling_queue.h
+++ b/resampling_queue.h
@@ -38,8 +38,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <zita-resampler/vresampler.h>
 #include <deque>
diff --git a/stereocompressor.cpp b/stereocompressor.cpp
index 808b71d..d9f1142 100644
--- a/stereocompressor.cpp
+++ b/stereocompressor.cpp
@@ -1,8 +1,8 @@
-#include <math.h>
+#include "stereocompressor.h"
+
 #include <assert.h>
 #include <algorithm>
-
-#include "stereocompressor.h"
+#include <cmath>
 
 using namespace std;
 
diff --git a/stereocompressor.h b/stereocompressor.h
index 239f284..be13ce2 100644
--- a/stereocompressor.h
+++ b/stereocompressor.h
@@ -1,6 +1,7 @@
 #ifndef _STEREOCOMPRESSOR_H
 #define _STEREOCOMPRESSOR_H 1
 
+#include <stddef.h>
 // A simple compressor based on absolute values, with independent
 // attack/release times. There is no sidechain or lookahead, but the
 // peak value is shared between both channels.
@@ -9,8 +10,6 @@
 // It has been adapted and relicensed under GPLv3 (or, at your option,
 // any later version) for Nageru, so that its license matches the rest of the code.
 
-class StereoBuffer;
-
 class StereoCompressor {
 public:
 	StereoCompressor(float sample_rate)
diff --git a/theme.cpp b/theme.cpp
index d6c9a23..3f52c83 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,17 +1,19 @@
 #include "theme.h"
 
 #include <assert.h>
+#include <bmusb/bmusb.h>
+#include <epoxy/gl.h>
 #include <lauxlib.h>
 #include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
 #include <movit/mix_effect.h>
+#include <movit/multiply_effect.h>
 #include <movit/overlay_effect.h>
 #include <movit/padding_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
-#include <movit/multiply_effect.h>
 #include <movit/util.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
@@ -19,14 +21,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstddef>
+#include <memory>
 #include <new>
 #include <utility>
-#include <memory>
 
 #include "defs.h"
+#include "deinterlace_effect.h"
 #include "flags.h"
 #include "image_input.h"
-#include "mixer.h"
+#include "input.h"
+#include "input_state.h"
+#include "pbo_frame_allocator.h"
+
+class Mixer;
 
 namespace movit {
 class ResourcePool;
diff --git a/theme.h b/theme.h
index 91c5c2e..ee9389e 100644
--- a/theme.h
+++ b/theme.h
@@ -1,26 +1,23 @@
 #ifndef _THEME_H
 #define _THEME_H 1
 
-#include <epoxy/gl.h>
 #include <lua.hpp>
-#include <movit/effect_chain.h>
-#include <movit/deinterlace_effect.h>
 #include <movit/ycbcr_input.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <functional>
+#include <map>
 #include <mutex>
-#include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include "defs.h"
-#include "input_state.h"
 #include "ref_counted_frame.h"
 
+struct InputState;
+
 namespace movit {
 class ResourcePool;
+class Effect;
+class EffectChain;
 struct ImageFormat;
 struct YCbCrFormat;
 }  // namespace movit
diff --git a/video_encoder.cpp b/video_encoder.cpp
index dfbf565..c817283 100644
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -1,16 +1,28 @@
 #include "video_encoder.h"
 
 #include <assert.h>
-
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
 #include <string>
+#include <thread>
+
+extern "C" {
+#include <libavutil/mem.h>
+}
 
+#include "audio_encoder.h"
 #include "defs.h"
+#include "ffmpeg_raii.h"
 #include "flags.h"
 #include "httpd.h"
-#include "timebase.h"
+#include "mux.h"
 #include "quicksync_encoder.h"
+#include "timebase.h"
 #include "x264_encoder.h"
 
+class RefCountedFrame;
+
 using namespace std;
 using namespace movit;
 
diff --git a/video_encoder.h b/video_encoder.h
index 9a9f861..0991f91 100644
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -5,21 +5,29 @@
 #ifndef _VIDEO_ENCODER_H
 #define _VIDEO_ENCODER_H
 
+#include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <atomic>
 #include <memory>
-#include <set>
+#include <mutex>
 #include <string>
 #include <vector>
 
-#include "audio_encoder.h"
-#include "mux.h"
-#include "ref_counted_frame.h"
+extern "C" {
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+}
+
 #include "ref_counted_gl_sync.h"
 
+class AudioEncoder;
 class DiskSpaceEstimator;
 class HTTPD;
+class Mux;
 class QSurface;
 class QuickSyncEncoder;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {
diff --git a/vu_common.cpp b/vu_common.cpp
index d4abab2..b40502c 100644
--- a/vu_common.cpp
+++ b/vu_common.cpp
@@ -1,11 +1,9 @@
 #include "vu_common.h"
 
-#include <math.h>
-#include <algorithm>
-
-#include <QBrush>
 #include <QColor>
 #include <QPainter>
+#include <algorithm>
+#include <cmath>
 
 using namespace std;
 
diff --git a/vu_common.h b/vu_common.h
index 9c7098e..c9a62a8 100644
--- a/vu_common.h
+++ b/vu_common.h
@@ -1,7 +1,7 @@
 #ifndef _VU_COMMON_H
 #define _VU_COMMON_H 1
 
-#include <QPainter>
+class QPainter;
 
 double lufs_to_pos(float level_lu, int height, float min_level, float max_level);
 
diff --git a/vumeter.cpp b/vumeter.cpp
index 2bf3639..65f081c 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,8 +1,12 @@
-#include <QPainter>
-
 #include "vumeter.h"
+
+#include <QPainter>
+#include <QRect>
 #include "vu_common.h"
 
+class QPaintEvent;
+class QResizeEvent;
+
 using namespace std;
 
 VUMeter::VUMeter(QWidget *parent)
diff --git a/vumeter.h b/vumeter.h
index 9b17f43..4ac2c0f 100644
--- a/vumeter.h
+++ b/vumeter.h
@@ -2,13 +2,17 @@
 #define VUMETER_H
 
 #include <math.h>
-#include <QLabel>
-#include <QPaintEvent>
+#include <QPixmap>
+#include <QString>
 #include <QWidget>
 #include <mutex>
 
 #include "vu_common.h"
 
+class QObject;
+class QPaintEvent;
+class QResizeEvent;
+
 class VUMeter : public QWidget
 {
 	Q_OBJECT
diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 9874519..f339e8c 100644
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -1,14 +1,20 @@
+#include "x264_encoder.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <x264.h>
+#include <cstdint>
 
 #include "defs.h"
 #include "flags.h"
 #include "mux.h"
 #include "timebase.h"
-#include "x264_encoder.h"
 #include "x264_speed_control.h"
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 
diff --git a/x264_encoder.h b/x264_encoder.h
index bb9f1dc..c71cba2 100644
--- a/x264_encoder.h
+++ b/x264_encoder.h
@@ -17,16 +17,16 @@
 #define _X264ENCODE_H 1
 
 #include <stdint.h>
-
+#include <x264.h>
 #include <atomic>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-#include <thread>
 #include <queue>
+#include <string>
+#include <thread>
 
 extern "C" {
-#include "x264.h"
 #include <libavformat/avformat.h>
 }
 
diff --git a/x264_speed_control.cpp b/x264_speed_control.cpp
index f201f80..1418132 100644
--- a/x264_speed_control.cpp
+++ b/x264_speed_control.cpp
@@ -1,11 +1,15 @@
 #include "x264_speed_control.h"
 
-#include "flags.h"
-
-#include <time.h>
-
+#include <math.h>
+#include <stdio.h>
+#include <x264.h>
 #include <algorithm>
 #include <chrono>
+#include <cmath>
+#include <ratio>
+#include <type_traits>
+
+#include "flags.h"
 
 using namespace std;
 using namespace std::chrono;
diff --git a/x264_speed_control.h b/x264_speed_control.h
index af4513e..b45e6c6 100644
--- a/x264_speed_control.h
+++ b/x264_speed_control.h
@@ -43,10 +43,7 @@
 // one does not need to patch x264 to use it in Nageru. It still could do with
 // some cleanup, but it's much, much better than just using a static preset.
 
-#include <stdio.h>
 #include <stdint.h>
-#include <string.h>
-#include <math.h>
 #include <chrono>
 #include <functional>
 
-- 
2.39.2