IWYU-fix nageru/*.h.

This is basically running clang-include-cleaner and then doing
manual cleanup (in particular, the Qt stuff confuses Clang).

diff --git a/nageru/alsa_input.h b/nageru/alsa_input.h
index 22420b9134c970442e7112020425f519faf161dd..b9cfc83832359261ec790763a8abab8af44b9541 100644 (file)
--- 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 b5aad15c5e400075ac10890353841f5baf43e6a8..5bdb164ca4ca049881ee8d03e93c3864e0410c3f 100644 (file)
--- 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 e683265c67f17485937fd4d7393538825f0649cc..8371613c4d76debc63d3df8b74c1e63246a482b5 100644 (file)
--- 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 bd279784950752fae64cbcd7eccd26430e6419bf..49cead7c4851dee82097fb2caed462373283ba6e 100644 (file)
--- 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 a1d81e200b3a7fefd3e569229295e8667c1ac0e5..c62c7fec36b87888f231832460a4fc56da3e1089 100644 (file)
--- 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 343159576d10a7e3f68fc0a02f77c7e985be19ff..b3a06b337798878dd37d3689ffb14e6dd43d7b17 100644 (file)
--- 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 cc3c67c566517b85fbf0b961747ac371555f075e..5a34b58f38f19780479dbf61bf6587de55302c79 100644 (file)
--- 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 cc821682a82a8ad4f366ad46556e82ddf52b4b1f..1e41887dfa81e919c64f9f6ce4308ac96b5d4526 100644 (file)
--- 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 ac5a840bb08476b77a393e6a8261cb2a51ced183..c816d33f7d74f2713e80889aa70fdbc7a73904d8 100644 (file)
--- 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 4aa76beca45df780d86d758401319cdeb7063005..d5ec41446f255639e1781aa8662b3156f9d94665 100644 (file)
--- 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 8539c22cbf32c9c5ac462fa817735b56e3c6bde7..9760e619e69bcd3841af5221a8e534942c72ac68 100644 (file)
--- 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 8f320e154f8ad243e595cc0e8e765b04d91b965e..09743a5abe5e72a9a8c12487c28d4fd756daeb5f 100644 (file)
--- 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 bec37999f9867e098b92b8702f0c879c764becf9..da27c2c56b0b75220162d4f1d0fa0fa1bef71ea4 100644 (file)
--- 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 fc584827a373e791ae85123a3a58de3d553b72c7..122bf86726ba4cb6d73a70a0ca81166d6e7d7431 100644 (file)
--- 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 c037a15880ccd7acb38c21e32bbd6246d07ae0a2..b697043aa6177979a03e3d2ef09d4c33783c143a 100644 (file)
--- 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 0cb0180d8c4ce4f673112422708f68f5608f9b4d..cc57def14e8714f84db32302f652f9b3eeb5e893 100644 (file)
--- 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 cd4bb024d8f767b0ae08edcfb1f8b46cf87683c1..7704410ec5d7f5feaadae43cd757a24b2a2f93a6 100644 (file)
--- 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 7b712ab13ec9920ac53fcf5a956fb349022b3ec0..1f6092e39618119e997bbbe970a45345e25a8070 100644 (file)
--- 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 2f33654537b9cd9bd6ff78a3b6bd86977af1d64f..95a1bcbea4e139b907404d73d6d392f3b6583666 100644 (file)
--- 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 102d7c5b20f3b0d1890b2d3bc982bf967763161e..be8d431916ce671e0d04bfdb157d0c577151bb21 100644 (file)
--- 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 d5a36245573cc58a51354ef0d6152779ec09c4e9..c80c3c5cdfebca2a7f99d76468fa86ba3b1acfc1 100644 (file)
--- 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 72272a1846fdf803b02d842551c29de8236ec33b..90f9f89f4200891d7096a77c31035a30003e13a6 100644 (file)
--- 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 18d520fcfc76f18ad72dbd55831382e0841657f1..5549a245064d613a0632cdd3e8b4786a2fcde8ff 100644 (file)
--- 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 5f19246841dd8e5f5e0bb6c6e41981ec4e71ecdc..896b63ba4b612a2e0fed0955b09e07b4cef7df6e 100644 (file)
--- 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 7b8969bbc7224e863d13b191049f424390b0cae7..7306f81cb9cc623b4889ecc97d52a4154ab80023 100644 (file)
--- 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 43ae6cbf622d1d43f66a49166cc38cb7671245ae..cff50aa6310036fe320f2f2021c9b445ec7e7a75 100644 (file)
--- 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 a9fb267949437773969685fb401856c384d14c9e..ee8952b85076666254d59a491a4ae18fdf427894 100644 (file)
--- 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 d5a77cc42b7121f2318cc948465def0d8715a838..9a52fc13b17cb9639e669e463ef8a6a745006827 100644 (file)
--- 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 94c62518d4422d02a99a113fa29d2525dce9e372..6d8463db76aef4e3a897a35e9aff49e9c8891e7d 100644 (file)
--- 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 045d5c7b0f28460db1700e47b10aff339bbbed66..9cbfe200f418dcae55522b15dfeea2929b9692b2 100644 (file)
--- 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 dd55d4c62a85695f6f7b737ec46eb27321f70433..31ea4e47b2feec508de1075dd93e9a1e3fd5c6cf 100644 (file)
--- 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 9dce2e649233d1274ecc9de20dc240241d0cb636..b2df67811e1e871bc712b8e203754863d9748723 100644 (file)
--- 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 4388bbe71720b71930d8a078249849c0b2dc645f..73d24513d08238dccef5c1748d6caced3c06d8c0 100644 (file)
--- 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 b2560b03b8de08250ddb6b1147592ba81afefd81..9ba1ffe64c80ad5db6e92e42d6707af3ae6fd06c 100644 (file)
--- 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 8a0a92af7361d1cb50de5a1e9ee9f802f48c172c..7fe0e8585a2b0993a359d362d6db95b08951d5ba 100644 (file)
--- 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 3b70a13cbd691f70f83e78f15064af7a3c83353f..e290542bd15f4ee7af9deb4187ad536bde6ef774 100644 (file)
--- 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 39c456f84d88012de1e69f69da142e2958932ab7..3cfb5fbe75d3054caa664dc0250cd3b6c81ba44f 100644 (file)
--- 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 1c2a9491148c50d1deeed8dacbe84b50b43fe627..6301f50d3d7274283b22dc942882a9ee58ba697b 100644 (file)
--- 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 d767ac3942c5db5d2212bf7a49b8abdb70294867..8e1648288dc8600b6f04f37948c74ea4e60c926a 100644 (file)
--- 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"