From a0e57ec99e9dfdd7e79bcf21e8c996dc43b6cb49 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Fri, 1 Mar 2024 14:52:19 +0100
Subject: [PATCH] IWYU-fix nageru/*.h.

This is basically running clang-include-cleaner and then doing
manual cleanup (in particular, the Qt stuff confuses Clang).
---
 nageru/alsa_input.h                  |  2 --
 nageru/analyzer.h                    |  3 +++
 nageru/audio_encoder.cpp             |  1 +
 nageru/audio_encoder.h               |  1 +
 nageru/audio_mixer.h                 |  2 ++
 nageru/av1_encoder.h                 |  2 --
 nageru/cef_capture.h                 |  5 +++--
 nageru/clickable_label.h             |  1 +
 nageru/compression_reduction_meter.h |  2 --
 nageru/decklink_output.h             |  5 ++++-
 nageru/decklink_util.h               |  1 +
 nageru/defs.h                        |  4 ----
 nageru/ellipsis_label.h              |  3 +++
 nageru/ffmpeg_capture.h              |  7 +++++++
 nageru/ffmpeg_util.h                 |  1 +
 nageru/filter.cpp                    |  1 +
 nageru/flags.h                       |  1 +
 nageru/image_input.h                 |  2 --
 nageru/input_state.h                 |  1 +
 nageru/lua_utils.h                   |  1 -
 nageru/mainwindow.h                  |  3 +++
 nageru/midi_mapper.h                 |  3 ++-
 nageru/mixer.h                       |  6 ++++--
 nageru/mjpeg_encoder.h               |  7 +++++--
 nageru/nageru_cef_app.h              | 13 ++++++-------
 nageru/pbo_frame_allocator.h         |  5 +++++
 nageru/print_latency.h               |  1 +
 nageru/queue_length_policy.h         |  3 +++
 nageru/quicksync_encoder_impl.h      | 13 ++++++++++++-
 nageru/resampling_queue.cpp          |  4 +++-
 nageru/resampling_queue.h            |  5 ++---
 nageru/rgb_histogram.h               |  1 +
 nageru/scene.h                       |  2 ++
 nageru/srt_metrics.h                 |  1 +
 nageru/theme.h                       |  6 ++++--
 nageru/tweaked_inputs.h              |  4 ++++
 nageru/v210_converter.h              |  1 +
 nageru/video_encoder.h               |  2 +-
 nageru/x264_encoder.h                |  3 ---
 39 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/nageru/alsa_input.h b/nageru/alsa_input.h
index 22420b9..b9cfc83 100644
--- a/nageru/alsa_input.h
+++ b/nageru/alsa_input.h
@@ -9,8 +9,6 @@
 
 #include <alsa/asoundlib.h>
 #include <stdint.h>
-#include <sys/types.h>
-#include <atomic>
 #include <chrono>
 #include <functional>
 #include <memory>
diff --git a/nageru/analyzer.h b/nageru/analyzer.h
index b5aad15..5bdb164 100644
--- a/nageru/analyzer.h
+++ b/nageru/analyzer.h
@@ -5,10 +5,13 @@
 #include <QMainWindow>
 #include <QString>
 #include <QTimer>
+#include <QObject>
+#include <QWidget>
 
 #include <string>
 
 #include <epoxy/gl.h>
+#include <epoxy/gl_generated.h>
 
 #include "mixer.h"
 
diff --git a/nageru/audio_encoder.cpp b/nageru/audio_encoder.cpp
index e683265..8371613 100644
--- a/nageru/audio_encoder.cpp
+++ b/nageru/audio_encoder.cpp
@@ -23,6 +23,7 @@ extern "C" {
 
 #include "defs.h"
 #include "shared/mux.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 
 using namespace std;
diff --git a/nageru/audio_encoder.h b/nageru/audio_encoder.h
index bd27978..49cead7 100644
--- a/nageru/audio_encoder.h
+++ b/nageru/audio_encoder.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 extern "C" {
+#include <libavcodec/codec.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
diff --git a/nageru/audio_mixer.h b/nageru/audio_mixer.h
index a1d81e2..c62c7fe 100644
--- a/nageru/audio_mixer.h
+++ b/nageru/audio_mixer.h
@@ -19,6 +19,7 @@
 #include <mutex>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "alsa_pool.h"
@@ -31,6 +32,7 @@
 #include "input_mapping.h"
 #include "resampling_queue.h"
 #include "stereocompressor.h"
+#include "shared/shared_defs.h"
 
 class DeviceSpecProto;
 
diff --git a/nageru/av1_encoder.h b/nageru/av1_encoder.h
index 3431595..b3a06b3 100644
--- a/nageru/av1_encoder.h
+++ b/nageru/av1_encoder.h
@@ -37,8 +37,6 @@ extern "C" {
 
 #include <movit/image_format.h>
 
-#include "defs.h"
-#include "shared/metrics.h"
 #include "print_latency.h"
 #include "video_codec_interface.h"
 
diff --git a/nageru/cef_capture.h b/nageru/cef_capture.h
index cc3c67c..5a34b58 100644
--- a/nageru/cef_capture.h
+++ b/nageru/cef_capture.h
@@ -9,20 +9,21 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include <condition_variable>
+#include <atomic>
 #include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <set>
 #include <string>
-#include <thread>
 #include <vector>
 
 #undef CHECK
 #include <cef_client.h>
 #include <cef_base.h>
 #include <cef_render_handler.h>
+#include <cef_frame.h>
+#include <cef_load_handler.h>
 
 #include <bmusb/bmusb.h>
 
diff --git a/nageru/clickable_label.h b/nageru/clickable_label.h
index cc82168..1e41887 100644
--- a/nageru/clickable_label.h
+++ b/nageru/clickable_label.h
@@ -4,6 +4,7 @@
 // Just like a normal QLabel, except that it can also emit a clicked signal.
 
 #include <QLabel>
+#include <QWidget>
 
 class QMouseEvent;
 
diff --git a/nageru/compression_reduction_meter.h b/nageru/compression_reduction_meter.h
index ac5a840..c816d33 100644
--- a/nageru/compression_reduction_meter.h
+++ b/nageru/compression_reduction_meter.h
@@ -9,8 +9,6 @@
 #include <QWidget>
 #include <mutex>
 
-#include "piecewise_interpolator.h"
-
 class QObject;
 class QPaintEvent;
 class QResizeEvent;
diff --git a/nageru/decklink_output.h b/nageru/decklink_output.h
index 4aa76be..d5ec414 100644
--- a/nageru/decklink_output.h
+++ b/nageru/decklink_output.h
@@ -7,7 +7,7 @@
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
-#include <deque>
+#include <map>
 #include <memory>
 #include <mutex>
 #include <queue>
@@ -16,9 +16,12 @@
 #include <vector>
 
 #include "DeckLinkAPI.h"
+#include "DeckLinkAPIModes.h"
 #include "DeckLinkAPITypes.h"
 #include "LinuxCOM.h"
 
+#include <bmusb/bmusb.h>
+
 #include "shared/context.h"
 #include "print_latency.h"
 #include "quittable_sleeper.h"
diff --git a/nageru/decklink_util.h b/nageru/decklink_util.h
index 8539c22..9760e61 100644
--- a/nageru/decklink_util.h
+++ b/nageru/decklink_util.h
@@ -8,6 +8,7 @@
 #include "bmusb/bmusb.h"
 #include "DeckLinkAPI.h"
 #include "DeckLinkAPITypes.h"
+#include "DeckLinkAPIDiscovery.h"
 
 class IDeckLinkDisplayModeIterator;
 
diff --git a/nageru/defs.h b/nageru/defs.h
index 8f320e1..09743a5 100644
--- a/nageru/defs.h
+++ b/nageru/defs.h
@@ -1,8 +1,6 @@
 #ifndef _DEFS_H
 #define _DEFS_H
 
-#include <libavformat/version.h>
-
 #define TYPICAL_FPS 60
 #define FAKE_FPS 25  // Must be an integer.
 // #define MAX_VIDEO_CARDS 16  // defined in shared_defs.h.
@@ -25,8 +23,6 @@
 #define DEFAULT_SRT_PORT 9710
 #define DEFAULT_SRT_OUTPUT_LATENCY_MS 2000
 
-#include "shared/shared_defs.h"
-
 // In number of frames. Comes in addition to any internal queues in x264
 // (frame threading, lookahead, etc.).
 #define X264_QUEUE_LENGTH 50
diff --git a/nageru/ellipsis_label.h b/nageru/ellipsis_label.h
index bec3799..da27c2c 100644
--- a/nageru/ellipsis_label.h
+++ b/nageru/ellipsis_label.h
@@ -2,6 +2,9 @@
 #define _ELLIPSIS_LABEL_H 1
 
 #include <QLabel>
+#include <QFontMetrics>
+#include <QWidget>
+#include <QObject>
 
 class EllipsisLabel : public QLabel {
 	Q_OBJECT
diff --git a/nageru/ffmpeg_capture.h b/nageru/ffmpeg_capture.h
index fc58482..122bf86 100644
--- a/nageru/ffmpeg_capture.h
+++ b/nageru/ffmpeg_capture.h
@@ -24,7 +24,12 @@
 // see the subtitle until the next frame.
 
 #include <assert.h>
+#include <stddef.h>
 #include <stdint.h>
+#include <time.h>
+
+#include <atomic>
+#include <chrono>
 #include <functional>
 #include <map>
 #include <memory>
@@ -32,11 +37,13 @@
 #include <set>
 #include <string>
 #include <thread>
+#include <vector>
 
 #include <movit/effect.h>
 #include <movit/ycbcr.h>
 
 extern "C" {
+#include <libavutil/frame.h>
 #include <libswresample/swresample.h>
 #include <libavutil/channel_layout.h>
 #include <libavutil/pixfmt.h>
diff --git a/nageru/ffmpeg_util.h b/nageru/ffmpeg_util.h
index c037a15..b697043 100644
--- a/nageru/ffmpeg_util.h
+++ b/nageru/ffmpeg_util.h
@@ -7,6 +7,7 @@
 
 extern "C" {
 #include <libavformat/avformat.h>
+#include <libavutil/avutil.h>
 }
 
 // Look for the file in all theme_dirs until we find one;
diff --git a/nageru/filter.cpp b/nageru/filter.cpp
index 0cb0180..cc57def 100644
--- a/nageru/filter.cpp
+++ b/nageru/filter.cpp
@@ -6,6 +6,7 @@
 #include <complex>
 
 #include "defs.h"
+#include "shared/shared_defs.h"
 
 #ifdef __SSE__
 #include <mmintrin.h>
diff --git a/nageru/flags.h b/nageru/flags.h
index cd4bb02..7704410 100644
--- a/nageru/flags.h
+++ b/nageru/flags.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "defs.h"
+#include "shared/shared_defs.h"
 #include "ycbcr_interpretation.h"
 
 struct Flags {
diff --git a/nageru/image_input.h b/nageru/image_input.h
index 7b712ab..1f6092e 100644
--- a/nageru/image_input.h
+++ b/nageru/image_input.h
@@ -2,11 +2,9 @@
 #define _IMAGE_INPUT_H 1
 
 #include <epoxy/gl.h>
-#include <movit/flat_input.h>
 #include <stdbool.h>
 #include <time.h>
 #include <condition_variable>
-#include <cstdint>
 #include <map>
 #include <memory>
 #include <mutex>
diff --git a/nageru/input_state.h b/nageru/input_state.h
index 2f33654..95a1bcb 100644
--- a/nageru/input_state.h
+++ b/nageru/input_state.h
@@ -5,6 +5,7 @@
 
 #include "defs.h"
 #include "ref_counted_frame.h"
+#include "shared/shared_defs.h"
 
 struct BufferedFrame {
 	RefCountedFrame frame;
diff --git a/nageru/lua_utils.h b/nageru/lua_utils.h
index 102d7c5..be8d431 100644
--- a/nageru/lua_utils.h
+++ b/nageru/lua_utils.h
@@ -3,7 +3,6 @@
 
 #include <lauxlib.h>
 #include <lua.hpp>
-
 #include <mutex>
 #include <utility>
 
diff --git a/nageru/mainwindow.h b/nageru/mainwindow.h
index d5a3624..c80c3c5 100644
--- a/nageru/mainwindow.h
+++ b/nageru/mainwindow.h
@@ -1,10 +1,12 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include <memory>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <QMainWindow>
 #include <QString>
+#include <QWidget>
 #include <chrono>
 #include <string>
 #include <vector>
@@ -13,6 +15,7 @@
 #include "audio_mixer.h"
 #include "midi_mapper.h"
 #include "mixer.h"
+#include "theme.h"
 
 class QDial;
 class QEvent;
diff --git a/nageru/midi_mapper.h b/nageru/midi_mapper.h
index 72272a1..90f9f89 100644
--- a/nageru/midi_mapper.h
+++ b/nageru/midi_mapper.h
@@ -8,13 +8,14 @@
 // This way, it is possible to control audio functionality using physical
 // pots and faders instead of the mouse.
 
+#include <stdint.h>
+
 #include <atomic>
 #include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <string>
-#include <thread>
 
 #include "defs.h"
 #include "shared/midi_device.h"
diff --git a/nageru/mixer.h b/nageru/mixer.h
index 18d520f..5549a24 100644
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -14,6 +14,7 @@
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
+#include <deque>
 #include <functional>
 #include <map>
 #include <memory>
@@ -21,14 +22,14 @@
 #include <queue>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <movit/effect.h>
-#include <movit/image_format.h>
 
 #include "audio_mixer.h"
+#include "card_type.h"
 #include "bmusb/bmusb.h"
-#include "defs.h"
 #include "ffmpeg_capture.h"
 #include "shared/httpd.h"
 #include "input_state.h"
@@ -39,6 +40,7 @@
 #include "shared/ref_counted_gl_sync.h"
 #include "srt_metrics.h"
 #include "theme.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 #include "video_encoder.h"
 #include "ycbcr_interpretation.h"
diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index 5f19246..896b63b 100644
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -1,7 +1,6 @@
 #ifndef _MJPEG_ENCODER_H
 #define _MJPEG_ENCODER_H 1
 
-#include "defs.h"
 #include "shared/ffmpeg_raii.h"
 #include "shared/httpd.h"
 #include "shared/va_resource_pool.h"
@@ -16,15 +15,19 @@ extern "C" {
 #include <atomic>
 #include <bmusb/bmusb.h>
 #include <condition_variable>
-#include <list>
+#include <map>
+#include <memory>
 #include <mutex>
 #include <queue>
+#include <stddef.h>
 #include <stdint.h>
 #include <string>
 #include <thread>
+#include <vector>
 
 #include <movit/effect.h>
 #include <va/va.h>
+#include <va/va_enc_jpeg.h>
 
 struct jpeg_compress_struct;
 struct VADisplayWithCleanup;
diff --git a/nageru/nageru_cef_app.h b/nageru/nageru_cef_app.h
index 7b8969b..7306f81 100644
--- a/nageru/nageru_cef_app.h
+++ b/nageru/nageru_cef_app.h
@@ -14,20 +14,19 @@
 // have to be run from the message loop, but that's fine; CEF gives us tools
 // to post tasks to it.
 
-#include <stdio.h>
-
 #include <cef_app.h>
+#include <cef_base.h>
 #include <cef_browser.h>
-#include <cef_client.h>
-#include <cef_version.h>
+#include <cef_browser_process_handler.h>
+#include <cef_command_line.h>
+#include <cef_render_process_handler.h>
+#include <cef_task.h>
 
-#include <atomic>
 #include <condition_variable>
 #include <functional>
 #include <mutex>
-#include <unordered_set>
 #include <thread>
-#include <vector>
+#include <utility>
 
 // Takes in arbitrary lambdas and converts them to something CefPostTask() will accept.
 class CEFTaskAdapter : public CefTask
diff --git a/nageru/pbo_frame_allocator.h b/nageru/pbo_frame_allocator.h
index 43ae6cb..cff50aa 100644
--- a/nageru/pbo_frame_allocator.h
+++ b/nageru/pbo_frame_allocator.h
@@ -4,14 +4,19 @@
 #include <epoxy/gl.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <string>
 #include <queue>
 
+#include <movit/effect.h>
 #include <movit/ycbcr.h>
 
 #include "bmusb/bmusb.h"
 #include "mjpeg_encoder.h"
+#include "shared/va_resource_pool.h"
 
 class MJPEGEncoder;
 
diff --git a/nageru/print_latency.h b/nageru/print_latency.h
index a9fb267..ee8952b 100644
--- a/nageru/print_latency.h
+++ b/nageru/print_latency.h
@@ -6,6 +6,7 @@
 // point when the frame is ready to be output in some form).
 
 #include <chrono>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/nageru/queue_length_policy.h b/nageru/queue_length_policy.h
index d5a77cc..9a52fc1 100644
--- a/nageru/queue_length_policy.h
+++ b/nageru/queue_length_policy.h
@@ -1,6 +1,9 @@
 #ifndef _QUEUE_LENGTH_POLICY_H
 #define _QUEUE_LENGTH_POLICY_H 1
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <atomic>
 #include <chrono>
 #include <deque>
diff --git a/nageru/quicksync_encoder_impl.h b/nageru/quicksync_encoder_impl.h
index 94c6251..6d8463d 100644
--- a/nageru/quicksync_encoder_impl.h
+++ b/nageru/quicksync_encoder_impl.h
@@ -1,28 +1,39 @@
 #ifndef _QUICKSYNC_ENCODER_IMPL_H
 #define _QUICKSYNC_ENCODER_IMPL_H 1
 
+#include <stddef.h>
+#include <stdint.h>
 #include <epoxy/egl.h>
+#include <epoxy/gl.h>
 #include <movit/image_format.h>
 #include <va/va.h>
+#include <va/va_enc_h264.h>
 
+#include <atomic>
 #include <condition_variable>
+#include <deque>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <queue>
 #include <string>
-#include <stack>
 #include <thread>
 #include <unordered_map>
+#include <vector>
 
 #include "audio_encoder.h"
 #include "defs.h"
 #include "shared/timebase.h"
 #include "print_latency.h"
+#include "ref_counted_frame.h"
 #include "shared/ref_counted_gl_sync.h"
 #include "shared/va_display.h"
 #include "v4l_output.h"
 
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
 #define SURFACE_NUM 16 /* 16 surfaces for source YUV */
 #define MAX_NUM_REF1 16 // Seemingly a hardware-fixed value, not related to SURFACE_NUM
 #define MAX_NUM_REF2 32 // Seemingly a hardware-fixed value, not related to SURFACE_NUM
diff --git a/nageru/resampling_queue.cpp b/nageru/resampling_queue.cpp
index 045d5c7..9cbfe20 100644
--- a/nageru/resampling_queue.cpp
+++ b/nageru/resampling_queue.cpp
@@ -20,12 +20,14 @@
 #include "resampling_queue.h"
 
 #include <assert.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <zita-resampler/vresampler.h>
 #include <algorithm>
-#include <cmath>
+
+#include "shared/shared_defs.h"
 
 using namespace std;
 using namespace std::chrono;
diff --git a/nageru/resampling_queue.h b/nageru/resampling_queue.h
index dd55d4c..31ea4e4 100644
--- a/nageru/resampling_queue.h
+++ b/nageru/resampling_queue.h
@@ -38,14 +38,13 @@
 //  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 <stddef.h>
 #include <sys/types.h>
 #include <zita-resampler/vresampler.h>
 #include <chrono>
 #include <deque>
-#include <memory>
+#include <string>
 
-#include "defs.h"
-#include "input_mapping.h"
 
 class ResamplingQueue {
 public:
diff --git a/nageru/rgb_histogram.h b/nageru/rgb_histogram.h
index 9dce2e6..b2df678 100644
--- a/nageru/rgb_histogram.h
+++ b/nageru/rgb_histogram.h
@@ -5,6 +5,7 @@
 #include <QPixmap>
 #include <QWidget>
 #include <QColor>
+#include <vector>
 
 #include "vu_common.h"
 
diff --git a/nageru/scene.h b/nageru/scene.h
index 4388bbe..73d2451 100644
--- a/nageru/scene.h
+++ b/nageru/scene.h
@@ -13,11 +13,13 @@
 // (directly to screen, RGBA) or live (Y'CbCr output).
 
 #include <stddef.h>
+#include <array>
 #include <bitset>
 #include <functional>
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 class CEFCapture;
diff --git a/nageru/srt_metrics.h b/nageru/srt_metrics.h
index b2560b0..9ba1ffe 100644
--- a/nageru/srt_metrics.h
+++ b/nageru/srt_metrics.h
@@ -1,6 +1,7 @@
 #ifndef _SRT_METRICS_H
 #define _SRT_METRICS_H 1
 
+#include <stdint.h>
 #include <atomic>
 #include <vector>
 #include <string>
diff --git a/nageru/theme.h b/nageru/theme.h
index 8a0a92a..7fe0e85 100644
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -5,17 +5,19 @@
 #include <movit/effect.h>
 #include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
-#include <stdbool.h>
+#include <array>
 #include <functional>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "bmusb/bmusb.h"
-#include "defs.h"
 #include "ref_counted_frame.h"
+#include "shared/shared_defs.h"
 #include "tweaked_inputs.h"
 
 class Scene;
diff --git a/nageru/tweaked_inputs.h b/nageru/tweaked_inputs.h
index 3b70a13..e290542 100644
--- a/nageru/tweaked_inputs.h
+++ b/nageru/tweaked_inputs.h
@@ -3,6 +3,10 @@
 
 // Some tweaked variations of Movit inputs.
 
+#include <string>
+
+#include <epoxy/gl.h>
+#include <movit/image_format.h>
 #include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 
diff --git a/nageru/v210_converter.h b/nageru/v210_converter.h
index 39c456f..3cfb5fb 100644
--- a/nageru/v210_converter.h
+++ b/nageru/v210_converter.h
@@ -48,6 +48,7 @@
 // (1.4 ms equates to about 35% of the theoretical memory bandwidth of
 // 12.8 GB/sec, which is pretty good.)
 
+#include <stddef.h>
 #include <map>
 
 #include <epoxy/gl.h>
diff --git a/nageru/video_encoder.h b/nageru/video_encoder.h
index 1c2a949..6301f50 100644
--- a/nageru/video_encoder.h
+++ b/nageru/video_encoder.h
@@ -6,6 +6,7 @@
 #define _VIDEO_ENCODER_H
 
 #include <epoxy/gl.h>
+#include <epoxy/gl_generated.h>
 #include <movit/image_format.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -14,7 +15,6 @@
 #include <mutex>
 #include <string>
 #include <vector>
-#include <chrono>
 
 extern "C" {
 #include <libavformat/avformat.h>
diff --git a/nageru/x264_encoder.h b/nageru/x264_encoder.h
index d767ac3..8e16482 100644
--- a/nageru/x264_encoder.h
+++ b/nageru/x264_encoder.h
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <x264.h>
 #include <atomic>
-#include <chrono>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
@@ -32,8 +31,6 @@ extern "C" {
 
 #include <movit/image_format.h>
 
-#include "defs.h"
-#include "shared/metrics.h"
 #include "print_latency.h"
 #include "video_codec_interface.h"
 #include "x264_dynamic.h"
-- 
2.39.2