From f81ae3be1aae619fe4ad022f55d95a4a83ace076 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Fri, 1 Mar 2024 15:33:23 +0100
Subject: [PATCH] IWYU-fix nageru/*.cpp.

This is basically running clang-include-cleaner and then doing
manual cleanup (in particular, the Qt stuff confuses Clang).
---
 nageru/alsa_input.cpp                  |  7 ++--
 nageru/alsa_output.cpp                 |  2 ++
 nageru/alsa_pool.cpp                   | 13 +++++--
 nageru/analyzer.cpp                    | 19 ++++++++++
 nageru/audio_encoder.cpp               |  6 ++--
 nageru/audio_mixer.cpp                 | 20 +++++++++--
 nageru/basic_stats.cpp                 |  3 ++
 nageru/benchmark_audio_mixer.cpp       |  3 +-
 nageru/cef_capture.cpp                 | 10 ++++--
 nageru/chroma_subsampler.cpp           |  3 ++
 nageru/compression_reduction_meter.cpp |  9 +++++
 nageru/context_menus.cpp               |  5 +++
 nageru/correlation_measurer.cpp        |  2 ++
 nageru/correlation_meter.cpp           |  4 +++
 nageru/decklink_capture.cpp            |  6 ++++
 nageru/decklink_output.cpp             | 24 +++++++++++--
 nageru/decklink_util.cpp               | 14 ++++++--
 nageru/ffmpeg_capture.cpp              | 31 ++++++++++++++---
 nageru/ffmpeg_util.cpp                 | 10 ++++++
 nageru/filter.cpp                      |  1 -
 nageru/flags.cpp                       |  8 +++++
 nageru/glwidget.cpp                    | 15 +++++++-
 nageru/image_input.cpp                 | 35 +++++++++++--------
 nageru/input_mapping.cpp               |  7 ++--
 nageru/input_mapping_dialog.cpp        |  3 +-
 nageru/kaeru.cpp                       | 31 +++++++++++++++--
 nageru/lrameter.cpp                    |  5 +++
 nageru/main.cpp                        |  6 ++--
 nageru/mainwindow.cpp                  |  8 ++++-
 nageru/midi_mapper.cpp                 | 12 ++-----
 nageru/midi_mapping_dialog.cpp         |  8 ++++-
 nageru/mixer.cpp                       | 46 ++++++++++++++++--------
 nageru/mjpeg_encoder.cpp               | 48 ++++++++++++++++++++------
 nageru/nageru_cef_app.cpp              |  6 ++--
 nageru/nonlinear_fader.cpp             |  5 +--
 nageru/pbo_frame_allocator.cpp         |  7 +++-
 nageru/print_latency.cpp               |  5 +++
 nageru/quicksync_encoder.cpp           | 28 ++++++++-------
 nageru/resampling_queue.cpp            |  3 ++
 nageru/rgb_histogram.cpp               | 11 ++++++
 nageru/scene.cpp                       | 16 ++++++++-
 nageru/srt_metrics.cpp                 |  3 ++
 nageru/stereocompressor.cpp            |  3 +-
 nageru/theme.cpp                       | 12 ++++++-
 nageru/timecode_renderer.cpp           |  8 ++++-
 nageru/tweaked_inputs.cpp              |  1 +
 nageru/v210_converter.cpp              |  2 ++
 nageru/v4l_output.cpp                  |  1 +
 nageru/video_encoder.cpp               | 29 +++++++++++-----
 nageru/vumeter.cpp                     |  5 +++
 nageru/x264_dynamic.cpp                |  1 +
 nageru/x264_encoder.cpp                | 18 +++++++---
 nageru/x264_speed_control.cpp          |  4 +--
 shared/va_display.h                    |  2 +-
 54 files changed, 471 insertions(+), 123 deletions(-)

diff --git a/nageru/alsa_input.cpp b/nageru/alsa_input.cpp
index 511dda9..f26a012 100644
--- a/nageru/alsa_input.cpp
+++ b/nageru/alsa_input.cpp
@@ -1,15 +1,18 @@
 #include "alsa_input.h"
 
 #include <alsa/error.h>
+#include <alsa/global.h>
+#include <alsa/pcm.h>
 #include <assert.h>
+#include <chrono>
 #include <errno.h>
+#include <pthread.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <thread>
 #include <cstdint>
 
 #include "alsa_pool.h"
 #include "bmusb/bmusb.h"
-#include "shared/timebase.h"
 
 using namespace std;
 using namespace std::chrono;
diff --git a/nageru/alsa_output.cpp b/nageru/alsa_output.cpp
index 8900817..21143e8 100644
--- a/nageru/alsa_output.cpp
+++ b/nageru/alsa_output.cpp
@@ -1,6 +1,8 @@
 #include "alsa_output.h"
 
 #include <alsa/asoundlib.h>
+#include <alsa/error.h>
+#include <alsa/pcm.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/nageru/alsa_pool.cpp b/nageru/alsa_pool.cpp
index fcd4fea..0c95ecb 100644
--- a/nageru/alsa_pool.cpp
+++ b/nageru/alsa_pool.cpp
@@ -1,27 +1,36 @@
 #include "alsa_pool.h"
 
 #include <alsa/asoundlib.h>
+#include <alsa/control.h>
+#include <alsa/error.h>
+#include <alsa/pcm.h>
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
+#include <linux/limits.h>
+#include <mutex>
 #include <pthread.h>
 #include <poll.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string>
 #include <sys/eventfd.h>
 #include <sys/inotify.h>
+#include <sys/poll.h>
+#include <thread>
 #include <unistd.h>
 #include <algorithm>
 #include <chrono>
 #include <functional>
 #include <iterator>
 #include <memory>
-#include <ratio>
+#include <vector>
 
 #include "alsa_input.h"
 #include "audio_mixer.h"
-#include "defs.h"
+#include "card_type.h"
 #include "input_mapping.h"
+#include "shared/shared_defs.h"
 #include "state.pb.h"
 
 using namespace std;
diff --git a/nageru/analyzer.cpp b/nageru/analyzer.cpp
index d8197cc..5ee873b 100644
--- a/nageru/analyzer.cpp
+++ b/nageru/analyzer.cpp
@@ -1,13 +1,32 @@
 #include "analyzer.h"
 
+#include <QComboBox>
+#include <QEvent>
 #include <QDialogButtonBox>
+#include <QImage>
+#include <QMainWindow>
 #include <QMouseEvent>
+#include <QPixmap>
+#include <QPushButton>
 #include <QPen>
+#include <QRgb>
 #include <QSurface>
 #include <QTimer>
 
+#include <algorithm>
+#include <functional>
 #include <movit/resource_pool.h>
 #include <movit/util.h>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <assert.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "shared/context.h"
 #include "flags.h"
diff --git a/nageru/audio_encoder.cpp b/nageru/audio_encoder.cpp
index 8371613..9de2082 100644
--- a/nageru/audio_encoder.cpp
+++ b/nageru/audio_encoder.cpp
@@ -1,6 +1,9 @@
 #include "audio_encoder.h"
+#include "shared/ffmpeg_raii.h"
 
 extern "C" {
+#include <libavcodec/codec.h>
+#include <libavcodec/codec_par.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
@@ -8,7 +11,6 @@ extern "C" {
 #include <libavutil/error.h>
 #include <libavutil/frame.h>
 #include <libavutil/mem.h>
-#include <libavutil/opt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
 }
@@ -17,11 +19,11 @@ extern "C" {
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "defs.h"
 #include "shared/mux.h"
 #include "shared/shared_defs.h"
 #include "shared/timebase.h"
diff --git a/nageru/audio_mixer.cpp b/nageru/audio_mixer.cpp
index 402131f..c2d31bb 100644
--- a/nageru/audio_mixer.cpp
+++ b/nageru/audio_mixer.cpp
@@ -3,26 +3,40 @@
 #include <assert.h>
 #include <bmusb/bmusb.h>
 #include <endian.h>
+#include <map>
 #include <math.h>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <string>
+#include <vector>
 #ifdef __SSE2__
 #include <immintrin.h>
 #endif
+#include <math.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <algorithm>
 #include <chrono>
-#include <cmath>
-#include <cstddef>
 #include <limits>
 #include <utility>
 
+#include "alsa_pool.h"
+#include "card_type.h"
 #include "decibel.h"
+#include "defs.h"
+#include "filter.h"
 #include "flags.h"
+#include "input_mapping.h"
+#include "resampling_queue.h"
 #include "shared/metrics.h"
+#include "shared/shared_defs.h"
 #include "state.pb.h"
-#include "shared/timebase.h"
+#include "stereocompressor.h"
 
 using namespace bmusb;
 using namespace std;
diff --git a/nageru/basic_stats.cpp b/nageru/basic_stats.cpp
index 9e07a1c..5e5658f 100644
--- a/nageru/basic_stats.cpp
+++ b/nageru/basic_stats.cpp
@@ -2,6 +2,9 @@
 #include "shared/metrics.h"
 
 #include <assert.h>
+#include <chrono>
+#include <cstdint>
+#include <cstdio>
 #include <sys/resource.h>
 #include <epoxy/gl.h>
 
diff --git a/nageru/benchmark_audio_mixer.cpp b/nageru/benchmark_audio_mixer.cpp
index 3f1ed7c..935295b 100644
--- a/nageru/benchmark_audio_mixer.cpp
+++ b/nageru/benchmark_audio_mixer.cpp
@@ -14,10 +14,9 @@
 
 #include "audio_mixer.h"
 #include "decibel.h"
-#include "defs.h"
 #include "input_mapping.h"
 #include "resampling_queue.h"
-#include "shared/timebase.h"
+#include "shared/shared_defs.h"
 
 #define NUM_BENCHMARK_CARDS 4
 #define NUM_WARMUP_FRAMES 100
diff --git a/nageru/cef_capture.cpp b/nageru/cef_capture.cpp
index fcd91a7..68a719a 100644
--- a/nageru/cef_capture.cpp
+++ b/nageru/cef_capture.cpp
@@ -1,18 +1,24 @@
 #include <assert.h>
+#include <functional>
+#include <map>
+#include <mutex>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <chrono>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "cef_capture.h"
+#include "base/cef_logging.h"
 #include "nageru_cef_app.h"
 #include "nageru/defs.h"
 
 #undef CHECK
-#include <cef_app.h>
 #include <cef_browser.h>
-#include <cef_client.h>
+#include <cef_frame.h>
+#include <cef_task.h>
 
 #include "bmusb/bmusb.h"
 
diff --git a/nageru/chroma_subsampler.cpp b/nageru/chroma_subsampler.cpp
index ff9d919..337b2b0 100644
--- a/nageru/chroma_subsampler.cpp
+++ b/nageru/chroma_subsampler.cpp
@@ -1,8 +1,11 @@
 #include "chroma_subsampler.h"
 #include "v210_converter.h"
 
+#include <string>
 #include <vector>
 
+#include <assert.h>
+#include <stdio.h>
 #include <movit/effect_util.h>
 #include <movit/resource_pool.h>
 #include <movit/util.h>
diff --git a/nageru/compression_reduction_meter.cpp b/nageru/compression_reduction_meter.cpp
index d123260..cd4a3c9 100644
--- a/nageru/compression_reduction_meter.cpp
+++ b/nageru/compression_reduction_meter.cpp
@@ -1,7 +1,16 @@
 #include "compression_reduction_meter.h"
 
+#include <QFont>
+#include <QPaintDevice>
 #include <QPainter>
+#include <QPixmap>
 #include <QRect>
+#include <QWidget>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <mutex>
+#include <vector>
 #include "piecewise_interpolator.h"
 #include "vu_common.h"
 
diff --git a/nageru/context_menus.cpp b/nageru/context_menus.cpp
index ee666e2..782bbe0 100644
--- a/nageru/context_menus.cpp
+++ b/nageru/context_menus.cpp
@@ -1,10 +1,15 @@
+#include <QAction>
 #include <QActionGroup>
+#include <QKeySequence>
 #include <QMenu>
 #include <QObject>
 
+#include <bmusb/bmusb.h>
+#include <cstdint>
 #include <map>
 
 #include "mixer.h"
+#include "shared/shared_defs.h"
 
 using namespace std;
 
diff --git a/nageru/correlation_measurer.cpp b/nageru/correlation_measurer.cpp
index d0150a0..6be16b8 100644
--- a/nageru/correlation_measurer.cpp
+++ b/nageru/correlation_measurer.cpp
@@ -21,6 +21,8 @@
 #include <assert.h>
 #include <cmath>
 #include <cstddef>
+#include <math.h>
+#include <vector>
 
 using namespace std;
 
diff --git a/nageru/correlation_meter.cpp b/nageru/correlation_meter.cpp
index 7246745..fafd415 100644
--- a/nageru/correlation_meter.cpp
+++ b/nageru/correlation_meter.cpp
@@ -2,11 +2,15 @@
 
 #include <math.h>
 #include <algorithm>
+#include <mutex>
 
 #include <QBrush>
 #include <QColor>
+#include <QPaintDevice>
 #include <QPainter>
+#include <QPixmap>
 #include <QRect>
+#include <QWidget>
 
 class QPaintEvent;
 class QResizeEvent;
diff --git a/nageru/decklink_capture.cpp b/nageru/decklink_capture.cpp
index 9bf1a0e..e239ec9 100644
--- a/nageru/decklink_capture.cpp
+++ b/nageru/decklink_capture.cpp
@@ -1,10 +1,16 @@
 #include "decklink_capture.h"
+#include "defs.h"
 
 #include <DeckLinkAPI.h>
 #include <DeckLinkAPIConfiguration.h>
 #include <DeckLinkAPIDiscovery.h>
 #include <DeckLinkAPIModes.h>
+#include <DeckLinkAPITypes.h>
+#include <LinuxCOM.h>
 #include <assert.h>
+#include <errno.h>
+#include <sched.h>
+#include <string>
 #ifdef __SSE2__
 #include <immintrin.h>
 #endif
diff --git a/nageru/decklink_output.cpp b/nageru/decklink_output.cpp
index 4c478fd..464aba9 100644
--- a/nageru/decklink_output.cpp
+++ b/nageru/decklink_output.cpp
@@ -1,19 +1,39 @@
-#include <movit/effect_util.h>
+#include "DeckLinkAPI.h"
+#include "DeckLinkAPIConfiguration.h"
+#include "DeckLinkAPIModes.h"
+#include "DeckLinkAPITypes.h"
+#include "LinuxCOM.h"
+#include <atomic>
+#include <assert.h>
+#include <chrono>
+#include <inttypes.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <memory>
+#include <movit/image_format.h>
 #include <movit/util.h>
 #include <movit/resource_pool.h>  // Must be above the Xlib includes.
 #include <pthread.h>
-#include <unistd.h>
+#include <thread>
 
 #include <mutex>
 
 #include <epoxy/egl.h>
+#include <utility>
+#include <vector>
 
 #include "chroma_subsampler.h"
 #include "decklink_output.h"
 #include "decklink_util.h"
 #include "flags.h"
+#include "ref_counted_frame.h"
 #include "shared/metrics.h"
 #include "print_latency.h"
+#include "shared/ref_counted_gl_sync.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 #include "v210_converter.h"
 
diff --git a/nageru/decklink_util.cpp b/nageru/decklink_util.cpp
index c2ebd57..1686389 100644
--- a/nageru/decklink_util.cpp
+++ b/nageru/decklink_util.cpp
@@ -1,7 +1,17 @@
-#include <DeckLinkAPI.h>
-#include <DeckLinkAPIModes.h>
+#include "DeckLinkAPI.h"
+#include "DeckLinkAPIDiscovery.h"
+#include "DeckLinkAPIModes.h"
+#include "DeckLinkAPITypes.h"
+#include "LinuxCOM.h"
 
 #include <assert.h>
+#include <bmusb/bmusb.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <map>
+#include <stdlib.h>
+#include <utility>
 
 #include "decklink_util.h"
 #include "flags.h"
diff --git a/nageru/ffmpeg_capture.cpp b/nageru/ffmpeg_capture.cpp
index 1a9a295..6dbcbd6 100644
--- a/nageru/ffmpeg_capture.cpp
+++ b/nageru/ffmpeg_capture.cpp
@@ -1,24 +1,47 @@
 #include "ffmpeg_capture.h"
+#include "defs.h"
+#include "shared/shared_defs.h"
 
 #include <assert.h>
+#include <cerrno>
+#include <ctime>
+#include <limits>
+#include <map>
+#include <memory>
+#include <movit/effect.h>
+#include <movit/image_format.h>
+#include <movit/ycbcr.h>
+#include <mutex>
 #include <pthread.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <thread>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
+#include <libavcodec/codec.h>
+#include <libavcodec/codec_id.h>
+#include <libavcodec/codec_par.h>
 #include <libavformat/avformat.h>
 #include <libavutil/avutil.h>
+#include <libavutil/buffer.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/common.h>
+#include <libavutil/dict.h>
 #include <libavutil/error.h>
 #include <libavutil/frame.h>
-#include <libavutil/imgutils.h>
-#include <libavutil/mem.h>
+#include <libavutil/hwcontext.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/pixdesc.h>
 #include <libavutil/pixfmt.h>
-#include <libavutil/opt.h>
+#include <libavutil/rational.h>
+#include <libavutil/samplefmt.h>
+#include <libavutil/version.h>
+#include <libswresample/swresample.h>
 #include <libswscale/swscale.h>
 }
 
diff --git a/nageru/ffmpeg_util.cpp b/nageru/ffmpeg_util.cpp
index 9a74ca1..451dd07 100644
--- a/nageru/ffmpeg_util.cpp
+++ b/nageru/ffmpeg_util.cpp
@@ -1,5 +1,9 @@
 #include "ffmpeg_util.h"
 
+#include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -7,6 +11,12 @@
 #include <string>
 #include <vector>
 
+extern "C" {
+#include <libavformat/avformat.h>
+#include <libavutil/avutil.h>
+#include <libavutil/common.h>
+}
+
 #include "flags.h"
 
 using namespace std;
diff --git a/nageru/filter.cpp b/nageru/filter.cpp
index cc57def..835ec6c 100644
--- a/nageru/filter.cpp
+++ b/nageru/filter.cpp
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <complex>
 
-#include "defs.h"
 #include "shared/shared_defs.h"
 
 #ifdef __SSE__
diff --git a/nageru/flags.cpp b/nageru/flags.cpp
index ec3b607..3231318 100644
--- a/nageru/flags.cpp
+++ b/nageru/flags.cpp
@@ -1,11 +1,19 @@
 #include "flags.h"
+#include "defs.h"
+#include "shared/shared_defs.h"
+#include "ycbcr_interpretation.h"
 
 #include <getopt.h>
+#include <math.h>
+#include <map>
+#include <movit/image_format.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <string>
 #include <utility>
+#include <vector>
 
 using namespace std;
 
diff --git a/nageru/glwidget.cpp b/nageru/glwidget.cpp
index 6ff304c..d649c3d 100644
--- a/nageru/glwidget.cpp
+++ b/nageru/glwidget.cpp
@@ -2,7 +2,9 @@
 
 #include <assert.h>
 #include <bmusb/bmusb.h>
+#include <math.h>
 #include <movit/effect_chain.h>
+#include <movit/image_format.h>
 #include <movit/resource_pool.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -18,14 +20,25 @@
 #include <map>
 #include <mutex>
 #include <utility>
+#include <vector>
+
+#include <QAction>
+#include <QActionGroup>
+#include <QGL>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QList>
+#include <QObject>
+#include <QVariant>
 
 #include "audio_mixer.h"
 #include "shared/context.h"
 #include "context_menus.h"
-#include "flags.h"
 #include "mainwindow.h"
 #include "mixer.h"
 #include "shared/ref_counted_gl_sync.h"
+#include "shared/shared_defs.h"
+#include "ycbcr_interpretation.h"
 
 class QMouseEvent;
 
diff --git a/nageru/image_input.cpp b/nageru/image_input.cpp
index 7b11679..316292b 100644
--- a/nageru/image_input.cpp
+++ b/nageru/image_input.cpp
@@ -1,15 +1,32 @@
 #include "image_input.h"
 
+#include <assert.h>
+#include <chrono>
+#include <condition_variable>
+#include <epoxy/egl.h>
 #include <errno.h>
-#include <movit/flat_input.h>
+#include <fcntl.h>
+#include <map>
+#include <memory>
 #include <movit/image_format.h>
 #include <movit/util.h>
+#include <mutex>
+#include <pthread.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
+#include <sys/stat.h>
+#include <thread>
+#include <time.h>
+#include <utility>
+#include <vector>
 
 extern "C" {
+#include <libavcodec/codec.h>
+#include <libavcodec/codec_par.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/avutil.h>
@@ -21,21 +38,11 @@ extern "C" {
 #include <libswscale/swscale.h>
 }
 
-#include <epoxy/egl.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <cstddef>
-#include <functional>
-#include <mutex>
-#include <thread>
-#include <utility>
-#include <vector>
-
+#include "ffmpeg_util.h"
 #include "shared/context.h"
 #include "shared/ffmpeg_raii.h"
-#include "ffmpeg_util.h"
-#include "flags.h"
+#include "shared/ref_counted_texture.h"
+#include "tweaked_inputs.h"
 
 struct SwsContext;
 
diff --git a/nageru/input_mapping.cpp b/nageru/input_mapping.cpp
index cad723a..d2adc6a 100644
--- a/nageru/input_mapping.cpp
+++ b/nageru/input_mapping.cpp
@@ -1,12 +1,11 @@
 #include "input_mapping.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 <map>
 #include <set>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "audio_mixer.h" 
 #include "state.pb.h"
diff --git a/nageru/input_mapping_dialog.cpp b/nageru/input_mapping_dialog.cpp
index 831d487..2fe7e34 100644
--- a/nageru/input_mapping_dialog.cpp
+++ b/nageru/input_mapping_dialog.cpp
@@ -15,13 +15,14 @@
 #include <QTableWidget>
 #include <QVariant>
 #include <functional>
-#include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "alsa_pool.h"
+#include "audio_mixer.h"
 #include "defs.h"
+#include "input_mapping.h"
 #include "shared/post_to_main_thread.h"
 #include "ui_input_mapping.h"
 
diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index 52cf70f..554259a 100644
--- a/nageru/kaeru.cpp
+++ b/nageru/kaeru.cpp
@@ -6,20 +6,45 @@
 #include "flags.h"
 #include "ffmpeg_capture.h"
 #include "mixer.h"
+#include "print_latency.h"
+#include "shared/ffmpeg_raii.h"
+#include "shared/httpd.h"
 #include "shared/mux.h"
 #include "quittable_sleeper.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 #include "x264_encoder.h"
 
 #include <assert.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
+#include <bmusb/bmusb.h>
 #include <chrono>
+#include <endian.h>
+#include <errno.h>
+#include <functional>
+#include <memory>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <string>
+#include <vector>
 
 extern "C" {
 #include <libavcodec/bsf.h>
+#include <libavcodec/codec_par.h>
+#include <libavcodec/packet.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+#include <libavformat/version.h>
+#include <libavutil/avutil.h>
+#include <libavutil/common.h>
+#include <libavutil/error.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/mem.h>
+#include <libavutil/rational.h>
+#include <libavutil/version.h>
 }
 
 using namespace bmusb;
diff --git a/nageru/lrameter.cpp b/nageru/lrameter.cpp
index 087a40e..e1c2e69 100644
--- a/nageru/lrameter.cpp
+++ b/nageru/lrameter.cpp
@@ -1,9 +1,14 @@
 #include "lrameter.h"
 
+#include <QPaintDevice>
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
+#include <QPixmap>
 #include <QRect>
+#include <QWidget>
+#include <math.h>
+#include <mutex>
 
 #include "vu_common.h"
 
diff --git a/nageru/main.cpp b/nageru/main.cpp
index cbf66e6..f8b5395 100644
--- a/nageru/main.cpp
+++ b/nageru/main.cpp
@@ -1,5 +1,6 @@
 extern "C" {
-#include <libavformat/avformat.h>
+#include <libavformat/version.h>
+#include <libavutil/version.h>
 }
 #include <stdbool.h>
 #include <stdio.h>
@@ -15,9 +16,6 @@ extern "C" {
 
 #ifdef HAVE_CEF
 #include <cef_app.h>
-#include <cef_browser.h>
-#include <cef_client.h>
-#include <cef_version.h>
 #endif
 
 #ifdef HAVE_SRT
diff --git a/nageru/mainwindow.cpp b/nageru/mainwindow.cpp
index 0a3ec15..e836d46 100644
--- a/nageru/mainwindow.cpp
+++ b/nageru/mainwindow.cpp
@@ -23,16 +23,19 @@
 #include <QKeySequence>
 #include <QLabel>
 #include <QLayoutItem>
+#include <QMainWindow>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QMouseEvent>
 #include <QObject>
+#include <QPaintDevice>
 #include <QPushButton>
 #include <QRect>
 #include <QRgb>
 #include <QShortcut>
 #include <QStackedWidget>
 #include <QToolButton>
+#include <QUrl>
 #include <QWidget>
 #include <algorithm>
 #include <chrono>
@@ -40,10 +43,12 @@
 #include <functional>
 #include <limits>
 #include <memory>
-#include <ratio>
 #include <string>
+#include <sys/types.h>
 #include <vector>
 
+#include "audio_mixer.h"
+#include "midi_mapper.h"
 #include "shared/aboutdialog.h"
 #include "alsa_pool.h"
 #include "analyzer.h"
@@ -62,6 +67,7 @@
 #include "mixer.h"
 #include "nonlinear_fader.h"
 #include "shared/post_to_main_thread.h"
+#include "theme.h"
 #include "ui_audio_expanded_view.h"
 #include "ui_audio_miniview.h"
 #include "ui_display.h"
diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index 1dccd8e..2fd6dbb 100644
--- a/nageru/midi_mapper.cpp
+++ b/nageru/midi_mapper.cpp
@@ -1,22 +1,16 @@
 #include "midi_mapper.h"
 
-#include <alsa/asoundlib.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 <pthread.h>
+#include <map>
+#include <mutex>
 #include <poll.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <sys/eventfd.h>
-#include <unistd.h>
+#include <string>
 #include <algorithm>
 #include <functional>
-#include <thread>
 
 #include "audio_mixer.h"
 #include "nageru_midi_mapping.pb.h"
diff --git a/nageru/midi_mapping_dialog.cpp b/nageru/midi_mapping_dialog.cpp
index 8352729..76776d2 100644
--- a/nageru/midi_mapping_dialog.cpp
+++ b/nageru/midi_mapping_dialog.cpp
@@ -6,21 +6,27 @@
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QFileDialog>
+#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QStringList>
 #include <QTreeWidget>
+#include <memory>
 #include <stdio.h>
 #include <algorithm>
 #include <cstddef>
 #include <functional>
 #include <limits>
 #include <string>
+#include <utility>
+#include <vector>
 
-#include "shared/controller_spin_box.h"
 #include "midi_mapper.h"
+#include "midi_mapping.pb.h"
 #include "nageru_midi_mapping.pb.h"
+#include "shared/controller_spin_box.h"
+#include "shared/midi_device.h"
 #include "shared/midi_mapper_util.h"
 #include "shared/post_to_main_thread.h"
 #include "ui_midi_mapping.h"
diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 736ceb2..b3e60fe 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -1,9 +1,16 @@
-#undef Success
-
 #include "mixer.h"
 
+#include <X11/Xlib.h>
+#include <algorithm>
 #include <assert.h>
+#include <chrono>
+#include <condition_variable>
 #include <epoxy/egl.h>
+#include <functional>
+#include <iterator>
+#include <map>
+#include <math.h>
+#include <memory>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
@@ -11,19 +18,21 @@
 #include <movit/image_format.h>
 #include <movit/init.h>
 #include <movit/resource_pool.h>
+#include <movit/util.h>
+#include <movit/ycbcr.h>
+#include <movit/ycbcr_input.h>
+#include <mutex>
+#include <netinet/in.h>
 #include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <algorithm>
-#include <chrono>
-#include <condition_variable>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <ratio>
+#include <string.h>
 #include <string>
+#include <sys/socket.h>
+#include <sys/syslog.h>
 #include <thread>
 #include <utility>
 #include <vector>
@@ -31,6 +40,7 @@
 #include "DeckLinkAPI.h"
 #include "LinuxCOM.h"
 #include "alsa_output.h"
+#include "audio_mixer.h"
 #include "basic_stats.h"
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
@@ -39,27 +49,33 @@
 #undef LOG_WARNING
 #include "cef_capture.h"
 #endif
+#include "card_type.h"
 #include "chroma_subsampler.h"
-#include "shared/context.h"
 #include "decklink_capture.h"
 #include "decklink_output.h"
 #include "decklink_util.h"
 #include "defs.h"
-#include "shared/disk_space_estimator.h"
 #include "ffmpeg_capture.h"
 #include "flags.h"
 #include "image_input.h"
 #include "input_mapping.h"
-#include "shared/metrics.h"
-#include "shared/va_display.h"
+#include "input_state.h"
+#include "libusb.h"
 #include "mjpeg_encoder.h"
 #include "pbo_frame_allocator.h"
-#include "shared/ref_counted_gl_sync.h"
+#include "queue_length_policy.h"
 #include "resampling_queue.h"
+#include "shared/context.h"
+#include "shared/disk_space_estimator.h"
+#include "shared/metrics.h"
+#include "shared/ref_counted_gl_sync.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
+#include "theme.h"
 #include "timecode_renderer.h"
 #include "v210_converter.h"
 #include "video_encoder.h"
+#include "ycbcr_interpretation.h"
 
 #undef Status
 #include <google/protobuf/util/json_util.h>
diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp
index a526c1e..71af169 100644
--- a/nageru/mjpeg_encoder.cpp
+++ b/nageru/mjpeg_encoder.cpp
@@ -1,33 +1,59 @@
 #include "mjpeg_encoder.h"
 
+#include <Eigen/Core>
+#include <algorithm>
 #include <assert.h>
+#include <bmusb/bmusb.h>
 #include <jpeglib.h>
-#include <unistd.h>
+#include <math.h>
+#include <movit/colorspace_conversion_effect.h>
+#include <movit/effect.h>
+#include <movit/image_format.h>
+#include <movit/ycbcr.h>
+#include <mutex>
+#include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <thread>
+#include <type_traits>
+#include <utility>
+#include <va/va.h>
+#include <va/va_enc_jpeg.h>
+#include <vector>
 #if __SSE2__
 #include <immintrin.h>
 #endif
-#include <list>
 
 extern "C" {
+#include <libavcodec/codec_id.h>
+#include <libavcodec/defs.h>
+#include <libavcodec/packet.h>
 #include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+#include <libavutil/avutil.h>
 #include <libavutil/channel_layout.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 "shared/ffmpeg_raii.h"
 #include "flags.h"
+#include "pbo_frame_allocator.h"
+#include "ref_counted_frame.h"
+#include "shared/ffmpeg_raii.h"
 #include "shared/httpd.h"
 #include "shared/memcpy_interleaved.h"
 #include "shared/metrics.h"
-#include "pbo_frame_allocator.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 #include "shared/va_display.h"
-
-#include <movit/colorspace_conversion_effect.h>
-
-#include <va/va.h>
-#include <va/va_drm.h>
-#include <va/va_x11.h>
+#include "shared/va_resource_pool.h"
 
 using namespace Eigen;
 using namespace bmusb;
diff --git a/nageru/nageru_cef_app.cpp b/nageru/nageru_cef_app.cpp
index 877635d..b74c04b 100644
--- a/nageru/nageru_cef_app.cpp
+++ b/nageru/nageru_cef_app.cpp
@@ -1,9 +1,11 @@
 #include <cef_app.h>
 #include <cef_browser.h>
-#include <cef_client.h>
-#include <cef_version.h>
+#include <cef_command_line.h>
+#include <cef_task.h>
 #include <QTimer>
 #include <QWidget>
+#include <mutex>
+#include <thread>
 
 #include "nageru_cef_app.h"
 
diff --git a/nageru/nonlinear_fader.cpp b/nageru/nonlinear_fader.cpp
index 06a929c..e3cf4f2 100644
--- a/nageru/nonlinear_fader.cpp
+++ b/nageru/nonlinear_fader.cpp
@@ -2,13 +2,14 @@
 
 #include <assert.h>
 #include <math.h>
+#include <QAbstractSlider>
+#include <QPaintDevice>
 #include <QPainter>
 #include <QPoint>
 #include <QRect>
+#include <QSlider>
 #include <QStyle>
 #include <QStyleOption>
-#include <memory>
-#include <utility>
 #include <vector>
 
 #include "piecewise_interpolator.h"
diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index d7204f2..709a2bf 100644
--- a/nageru/pbo_frame_allocator.cpp
+++ b/nageru/pbo_frame_allocator.cpp
@@ -1,14 +1,19 @@
 #include "pbo_frame_allocator.h"
 
 #include <bmusb/bmusb.h>
+#include <assert.h>
+#include <epoxy/gl.h>
 #include <movit/util.h>
+#include <mutex>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
+#include <utility>
+#include <va/va.h>
 
-#include "flags.h"
 #include "mjpeg_encoder.h"
+#include "shared/va_resource_pool.h"
 #include "v210_converter.h"
 #include "shared/va_display.h"
 
diff --git a/nageru/print_latency.cpp b/nageru/print_latency.cpp
index 76f05b7..450723f 100644
--- a/nageru/print_latency.cpp
+++ b/nageru/print_latency.cpp
@@ -1,13 +1,18 @@
 #include "print_latency.h"
 
+#include "defs.h"
 #include "flags.h"
+#include "ref_counted_frame.h"
 #include "shared/metrics.h"
 #include "mixer.h"
+#include "shared/shared_defs.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <algorithm>
 #include <chrono>
 #include <string>
+#include <vector>
 
 using namespace std;
 using namespace std::chrono;
diff --git a/nageru/quicksync_encoder.cpp b/nageru/quicksync_encoder.cpp
index 9c6e40c..36bf158 100644
--- a/nageru/quicksync_encoder.cpp
+++ b/nageru/quicksync_encoder.cpp
@@ -1,25 +1,24 @@
 #include "quicksync_encoder.h"
 
+#include <atomic>
+#include <errno.h>
+#include <epoxy/egl.h>
+#include <epoxy/gl.h>
 #include <movit/image_format.h>
 #include <movit/resource_pool.h>  // Must be above the Xlib includes.
 #include <movit/util.h>
 
 #include <EGL/eglplatform.h>
-#include <X11/Xlib.h>
 #include <assert.h>
 #include <epoxy/egl.h>
-#include <fcntl.h>
 #include <glob.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <va/va.h>
-#include <va/va_drm.h>
 #include <va/va_drmcommon.h>
 #include <va/va_enc_h264.h>
-#include <va/va_x11.h>
 #include <algorithm>
 #include <chrono>
 #include <condition_variable>
@@ -30,31 +29,36 @@
 #include <memory>
 #include <mutex>
 #include <queue>
-#include <stack>
 #include <string>
 #include <thread>
 #include <utility>
+#include <vector>
 
 extern "C" {
 
-#include <libavcodec/avcodec.h>
+#include <drm_fourcc.h>
+#include <libavcodec/packet.h>
+#include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 #include <libavutil/error.h>
-#include <drm_fourcc.h>
 
 }  // namespace
 
 #include "audio_encoder.h"
-#include "shared/context.h"
 #include "defs.h"
-#include "shared/disk_space_estimator.h"
-#include "shared/ffmpeg_raii.h"
 #include "flags.h"
-#include "shared/mux.h"
 #include "print_latency.h"
 #include "quicksync_encoder_impl.h"
 #include "ref_counted_frame.h"
+#include "shared/context.h"
+#include "shared/disk_space_estimator.h"
+#include "shared/ffmpeg_raii.h"
+#include "shared/metrics.h"
+#include "shared/mux.h"
+#include "shared/ref_counted_gl_sync.h"
 #include "shared/timebase.h"
+#include "shared/va_display.h"
+#include "v4l_output.h"
 #include "x264_encoder.h"
 
 using namespace movit;
diff --git a/nageru/resampling_queue.cpp b/nageru/resampling_queue.cpp
index 9cbfe20..a7756e4 100644
--- a/nageru/resampling_queue.cpp
+++ b/nageru/resampling_queue.cpp
@@ -20,10 +20,13 @@
 #include "resampling_queue.h"
 
 #include <assert.h>
+#include <chrono>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
+#include <sys/types.h>
 #include <zita-resampler/vresampler.h>
 #include <algorithm>
 
diff --git a/nageru/rgb_histogram.cpp b/nageru/rgb_histogram.cpp
index fb1a0ca..dc5bb96 100644
--- a/nageru/rgb_histogram.cpp
+++ b/nageru/rgb_histogram.cpp
@@ -1,7 +1,18 @@
 #include "rgb_histogram.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QPaintDevice>
 #include <QPainter>
+#include <QPen>
+#include <QPoint>
 #include <QRect>
+#include <QWidget>
+#include <algorithm>
+#include <cassert>
+#include <cstdio>
+#include <utility>
+#include <vector>
 
 class QPaintEvent;
 class QResizeEvent;
diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index 8e3dfd2..74d0e9e 100644
--- a/nageru/scene.cpp
+++ b/nageru/scene.cpp
@@ -1,8 +1,22 @@
+#include <algorithm>
+#include <array>
 #include <assert.h>
+#include <bitset>
+#include <bmusb/bmusb.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <functional>
+#include <map>
+#include <movit/effect.h>
+#include <mutex>
+#include <string>
+#include <utility>
+#include <vector>
 extern "C" {
 #include <lauxlib.h>
-#include <lua.hpp>
 }
+#include <lua.hpp>
 
 #ifdef HAVE_CEF
 #include "cef_capture.h"
diff --git a/nageru/srt_metrics.cpp b/nageru/srt_metrics.cpp
index 22d4729..2cba3f8 100644
--- a/nageru/srt_metrics.cpp
+++ b/nageru/srt_metrics.cpp
@@ -2,6 +2,9 @@
 #include "shared/metrics.h"
 
 #include <srt/srt.h>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace std;
 
diff --git a/nageru/stereocompressor.cpp b/nageru/stereocompressor.cpp
index d9f1142..16badee 100644
--- a/nageru/stereocompressor.cpp
+++ b/nageru/stereocompressor.cpp
@@ -2,7 +2,8 @@
 
 #include <assert.h>
 #include <algorithm>
-#include <cmath>
+#include <math.h>
+#include <stddef.h>
 
 using namespace std;
 
diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index cf323b0..06d147f 100644
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -1,11 +1,15 @@
 #include "theme.h"
 
+#include <algorithm>
+#include <array>
 #include <assert.h>
 #include <bmusb/bmusb.h>
 #include <epoxy/gl.h>
+#include <mutex>
 #include <stdarg.h>
 #include <lauxlib.h>
 #include <lua.hpp>
+#include <math.h>
 #include <movit/blur_effect.h>
 #include <movit/deinterlace_effect.h>
 #include <movit/effect.h>
@@ -28,11 +32,17 @@
 #include <stdlib.h>
 #include <cstddef>
 #include <memory>
-#include <new>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "audio_mixer.h"
 #include "defs.h"
+#include "input_mapping.h"
+#include "lua.h"
+#include "lualib.h"
+#include "shared/shared_defs.h"
+#include "tweaked_inputs.h"
 #ifdef HAVE_CEF
 #include "cef_capture.h"
 #endif
diff --git a/nageru/timecode_renderer.cpp b/nageru/timecode_renderer.cpp
index 7f72d41..745e6ca 100644
--- a/nageru/timecode_renderer.cpp
+++ b/nageru/timecode_renderer.cpp
@@ -1,14 +1,20 @@
 #include "timecode_renderer.h"
 
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <time.h>
+#include <epoxy/gl.h>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include <QFont>
 #include <QImage>
+#include <QPaintDevice>
 #include <QPainter>
 
 #include <epoxy/gl.h>
-#include <movit/effect_util.h>
 #include <movit/resource_pool.h>
 #include <movit/util.h>
 #include <sys/time.h>
diff --git a/nageru/tweaked_inputs.cpp b/nageru/tweaked_inputs.cpp
index 304c3b4..cd0a3c5 100644
--- a/nageru/tweaked_inputs.cpp
+++ b/nageru/tweaked_inputs.cpp
@@ -1,6 +1,7 @@
 #include <epoxy/gl.h>
 #include <movit/flat_input.h>
 #include <movit/util.h>
+#include <string>
 
 #include "tweaked_inputs.h"
 
diff --git a/nageru/v210_converter.cpp b/nageru/v210_converter.cpp
index 269126b..b9138af 100644
--- a/nageru/v210_converter.cpp
+++ b/nageru/v210_converter.cpp
@@ -1,7 +1,9 @@
 #include "v210_converter.h"
 
+#include <stdio.h>
 #include <epoxy/gl.h>
 #include <movit/util.h>
+#include <string>
 
 using namespace std;
 
diff --git a/nageru/v4l_output.cpp b/nageru/v4l_output.cpp
index f6c4e85..d2490e4 100644
--- a/nageru/v4l_output.cpp
+++ b/nageru/v4l_output.cpp
@@ -4,6 +4,7 @@
 #include <fcntl.h>
 #include <linux/videodev2.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp
index 3b7028d..b68086c 100644
--- a/nageru/video_encoder.cpp
+++ b/nageru/video_encoder.cpp
@@ -1,18 +1,27 @@
-#include "video_encoder.h"
-
+#include <algorithm>
 #include <assert.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <chrono>
+#include <epoxy/gl.h>
+#include <memory>
+#include <movit/image_format.h>
+#include <mutex>
 #include <netdb.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 #include <string>
+#include <sys/socket.h>
 #include <thread>
-#include <chrono>
+#include <time.h>
+#include <unistd.h>
+#include <vector>
 
 extern "C" {
 #include <libavutil/mem.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+#include <libavutil/avutil.h>
+#include <libavutil/rational.h>
 }
 
 #include "audio_encoder.h"
@@ -27,6 +36,10 @@ extern "C" {
 #include "quicksync_encoder.h"
 #include "shared/timebase.h"
 #include "x264_encoder.h"
+#include "video_encoder.h"
+#include "shared/metrics.h"
+#include "shared/ref_counted_gl_sync.h"
+#include "shared/shared_defs.h"
 
 class RefCountedFrame;
 
diff --git a/nageru/vumeter.cpp b/nageru/vumeter.cpp
index 228d2c2..2f25345 100644
--- a/nageru/vumeter.cpp
+++ b/nageru/vumeter.cpp
@@ -1,7 +1,12 @@
 #include "vumeter.h"
 
+#include <QPaintDevice>
 #include <QPainter>
+#include <QPixmap>
 #include <QRect>
+#include <QWidget>
+#include <math.h>
+#include <mutex>
 #include "vu_common.h"
 
 class QPaintEvent;
diff --git a/nageru/x264_dynamic.cpp b/nageru/x264_dynamic.cpp
index 3ed1811..8cdf42b 100644
--- a/nageru/x264_dynamic.cpp
+++ b/nageru/x264_dynamic.cpp
@@ -8,6 +8,7 @@
 #include <string.h>
 
 #include <string>
+#include <x264.h>
 
 using namespace std;
 
diff --git a/nageru/x264_encoder.cpp b/nageru/x264_encoder.cpp
index b38711c..014d7d1 100644
--- a/nageru/x264_encoder.cpp
+++ b/nageru/x264_encoder.cpp
@@ -1,16 +1,24 @@
 #include "x264_encoder.h"
 
 #include <assert.h>
+#include <atomic>
+#include <cstdint>
 #include <dlfcn.h>
+#include <functional>
+#include <inttypes.h>
+#include <math.h>
+#include <memory>
+#include <movit/image_format.h>
+#include <mutex>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
+#include <thread>
 #include <unistd.h>
+#include <vector>
 #include <x264.h>
-#include <atomic>
-#include <cstdint>
-#include <functional>
-#include <mutex>
 
 #include "defs.h"
 #include "flags.h"
@@ -22,7 +30,7 @@
 #include "x264_speed_control.h"
 
 extern "C" {
-#include <libavcodec/avcodec.h>
+#include <libavcodec/packet.h>
 #include <libavformat/avformat.h>
 }
 
diff --git a/nageru/x264_speed_control.cpp b/nageru/x264_speed_control.cpp
index 6ff3d24..0c7e7e8 100644
--- a/nageru/x264_speed_control.cpp
+++ b/nageru/x264_speed_control.cpp
@@ -3,15 +3,15 @@
 #include <dlfcn.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <x264.h>
 #include <algorithm>
 #include <chrono>
 #include <cmath>
-#include <ratio>
-#include <type_traits>
 
 #include "flags.h"
 #include "shared/metrics.h"
+#include "x264_dynamic.h"
 
 using namespace std;
 using namespace std::chrono;
diff --git a/shared/va_display.h b/shared/va_display.h
index 5809b65..9ac925a 100644
--- a/shared/va_display.h
+++ b/shared/va_display.h
@@ -1,5 +1,5 @@
 #ifndef _VA_DISPLAY_H
-#define _VA_DISPLAY _H1
+#define _VA_DISPLAY_H 1
 
 #include <va/va.h>
 #include <X11/Xlib.h>
-- 
2.39.2