Display and control your Android device
Cleanup includes
Romain Vimontaf15c72f9cae
diff --git a/app/src/adb/adb.c b/app/src/adb/adb.cindex 0cd3c0fd..40e9e968 100644--- a/app/src/adb/adb.c+++ b/app/src/adb/adb.c@@ -4,9 +4,10 @@#include <stdio.h>#include <stdlib.h>#include <string.h>+#include <sys/types.h>-#include "adb_device.h"-#include "adb_parser.h"+#include "adb/adb_device.h"+#include "adb/adb_parser.h"#include "util/env.h"#include "util/file.h"#include "util/log.h"diff --git a/app/src/adb/adb.h b/app/src/adb/adb.hindex 43310fb9..e4903902 100644--- a/app/src/adb/adb.h+++ b/app/src/adb/adb.h@@ -6,7 +6,7 @@#include <stdbool.h>#include <inttypes.h>-#include "adb_device.h"+#include "adb/adb_device.h"#include "util/intr.h"#define SC_ADB_NO_STDOUT (1 << 0)diff --git a/app/src/adb/adb_device.h b/app/src/adb/adb_device.hindex 56393bcf..308663ef 100644--- a/app/src/adb/adb_device.h+++ b/app/src/adb/adb_device.h@@ -4,7 +4,6 @@#include "common.h"#include <stdbool.h>-#include <stddef.h>#include "util/vector.h"diff --git a/app/src/adb/adb_parser.c b/app/src/adb/adb_parser.cindex 66bb1854..90a1b30b 100644--- a/app/src/adb/adb_parser.c+++ b/app/src/adb/adb_parser.c@@ -3,6 +3,7 @@#include <assert.h>#include <stdlib.h>#include <string.h>+#include <sys/types.h>#include "util/log.h"#include "util/str.h"diff --git a/app/src/adb/adb_parser.h b/app/src/adb/adb_parser.hindex f20349f6..b8738a35 100644--- a/app/src/adb/adb_parser.h+++ b/app/src/adb/adb_parser.h@@ -3,9 +3,9 @@#include "common.h"-#include <stddef.h>+#include <stdbool.h>-#include "adb_device.h"+#include "adb/adb_device.h"/*** Parse the available devices from the output of `adb devices`diff --git a/app/src/adb/adb_tunnel.c b/app/src/adb/adb_tunnel.cindex fa936e4b..43e80e13 100644--- a/app/src/adb/adb_tunnel.c+++ b/app/src/adb/adb_tunnel.c@@ -1,11 +1,11 @@#include "adb_tunnel.h"#include <assert.h>+#include <inttypes.h>-#include "adb.h"+#include "adb/adb.h"#include "util/log.h"#include "util/net_intr.h"-#include "util/process_intr.h"static boollisten_on_port(struct sc_intr *intr, sc_socket socket, uint16_t port) {diff --git a/app/src/audio_player.h b/app/src/audio_player.hindex 9133c24a..5a66d43b 100644--- a/app/src/audio_player.h+++ b/app/src/audio_player.h@@ -3,9 +3,7 @@#include "common.h"-#include <stdatomic.h>-#include <stdbool.h>-#include <SDL2/SDL.h>+#include <SDL2/SDL_audio.h>#include "audio_regulator.h"#include "trait/frame_sink.h"diff --git a/app/src/audio_regulator.c b/app/src/audio_regulator.cindex 3e4f78ad..f7e9b81e 100644--- a/app/src/audio_regulator.c+++ b/app/src/audio_regulator.c@@ -1,5 +1,9 @@#include "audio_regulator.h"+#include <assert.h>+#include <inttypes.h>+#include <stdlib.h>+#include <string.h>#include <libavcodec/avcodec.h>#include <libavutil/opt.h>diff --git a/app/src/audio_regulator.h b/app/src/audio_regulator.hindex 1c0eeb9f..03cf6325 100644--- a/app/src/audio_regulator.h+++ b/app/src/audio_regulator.h@@ -5,6 +5,8 @@#include <stdatomic.h>#include <stdbool.h>+#include <stddef.h>+#include <stdint.h>#include <libavcodec/avcodec.h>#include <libswresample/swresample.h>#include "util/audiobuf.h"diff --git a/app/src/cli.c b/app/src/cli.cindex ed1970d4..756934ea 100644--- a/app/src/cli.c+++ b/app/src/cli.c@@ -5,6 +5,7 @@#include <stdint.h>#include <stdio.h>#include <stdlib.h>+#include <string.h>#include <unistd.h>#include "options.h"@@ -13,6 +14,7 @@#include "util/str.h"#include "util/strbuf.h"#include "util/term.h"+#include "util/tick.h"#define STR_IMPL_(x) #x#define STR(x) STR_IMPL_(x)diff --git a/app/src/decoder.c b/app/src/decoder.cindex 5d42b8b0..4d0a1daf 100644--- a/app/src/decoder.c+++ b/app/src/decoder.c@@ -1,11 +1,9 @@#include "decoder.h"-#include <libavcodec/avcodec.h>-#include <libavformat/avformat.h>-#include <libavutil/channel_layout.h>+#include <errno.h>+#include <libavcodec/packet.h>+#include <libavutil/avutil.h>-#include "events.h"-#include "trait/frame_sink.h"#include "util/log.h"/** Downcast packet_sink to decoder */diff --git a/app/src/decoder.h b/app/src/decoder.hindex ba8903f4..1f525fae 100644--- a/app/src/decoder.h+++ b/app/src/decoder.h@@ -3,13 +3,11 @@#include "common.h"+#include <libavcodec/avcodec.h>+#include "trait/frame_source.h"#include "trait/packet_sink.h"-#include <stdbool.h>-#include <libavcodec/avcodec.h>-#include <libavformat/avformat.h>-struct sc_decoder {struct sc_packet_sink packet_sink; // packet sink traitstruct sc_frame_source frame_source; // frame source traitdiff --git a/app/src/delay_buffer.c b/app/src/delay_buffer.cindex e89a2092..f75c6f72 100644--- a/app/src/delay_buffer.c+++ b/app/src/delay_buffer.c@@ -2,9 +2,7 @@#include <assert.h>#include <stdlib.h>--#include <libavutil/avutil.h>-#include <libavformat/avformat.h>+#include <libavcodec/avcodec.h>#include "util/log.h"diff --git a/app/src/delay_buffer.h b/app/src/delay_buffer.hindex 18c1ce94..61cd77e4 100644--- a/app/src/delay_buffer.h+++ b/app/src/delay_buffer.h@@ -4,6 +4,7 @@#include "common.h"#include <stdbool.h>+#include <libavutil/frame.h>#include "clock.h"#include "trait/frame_source.h"diff --git a/app/src/demuxer.c b/app/src/demuxer.cindex 7223b553..885cd6ee 100644--- a/app/src/demuxer.c+++ b/app/src/demuxer.c@@ -1,14 +1,11 @@#include "demuxer.h"#include <assert.h>+#include <inttypes.h>+#include <libavcodec/avcodec.h>#include <libavutil/channel_layout.h>-#include <libavutil/time.h>-#include <unistd.h>-#include "decoder.h"-#include "events.h"#include "packet_merger.h"-#include "recorder.h"#include "util/binary.h"#include "util/log.h"diff --git a/app/src/demuxer.h b/app/src/demuxer.hindex 5587d12d..2b7cb703 100644--- a/app/src/demuxer.h+++ b/app/src/demuxer.h@@ -4,12 +4,8 @@#include "common.h"#include <stdbool.h>-#include <stdint.h>-#include <libavcodec/avcodec.h>-#include <libavformat/avformat.h>#include "trait/packet_source.h"-#include "trait/packet_sink.h"#include "util/net.h"#include "util/thread.h"diff --git a/app/src/device_msg.h b/app/src/device_msg.hindex 86b2ccb7..d6c701bb 100644--- a/app/src/device_msg.h+++ b/app/src/device_msg.h@@ -3,9 +3,9 @@#include "common.h"-#include <stdbool.h>+#include <stddef.h>#include <stdint.h>-#include <unistd.h>+#include <sys/types.h>#define DEVICE_MSG_MAX_SIZE (1 << 18) // 256k// type: 1 byte; length: 4 bytesdiff --git a/app/src/display.c b/app/src/display.cindex 39018834..aee8ef80 100644--- a/app/src/display.c+++ b/app/src/display.c@@ -1,6 +1,8 @@#include "display.h"#include <assert.h>+#include <inttypes.h>+#include <string.h>#include <libavutil/pixfmt.h>#include "util/log.h"diff --git a/app/src/display.h b/app/src/display.hindex 064bb7bf..4de9b0a9 100644--- a/app/src/display.h+++ b/app/src/display.h@@ -4,7 +4,8 @@#include "common.h"#include <stdbool.h>-#include <libavformat/avformat.h>+#include <stdint.h>+#include <libavutil/frame.h>#include <SDL2/SDL.h>#include "coords.h"diff --git a/app/src/events.c b/app/src/events.cindex ce885241..b4322d1b 100644--- a/app/src/events.c+++ b/app/src/events.c@@ -1,5 +1,7 @@#include "events.h"+#include <assert.h>+#include "util/log.h"#include "util/thread.h"diff --git a/app/src/file_pusher.c b/app/src/file_pusher.cindex 06911052..681fb5d6 100644--- a/app/src/file_pusher.c+++ b/app/src/file_pusher.c@@ -1,11 +1,11 @@#include "file_pusher.h"#include <assert.h>+#include <stdlib.h>#include <string.h>#include "adb/adb.h"#include "util/log.h"-#include "util/process_intr.h"#define DEFAULT_PUSH_TARGET "/sdcard/Download/"diff --git a/app/src/fps_counter.c b/app/src/fps_counter.cindex dd4ae1da..1daa42ba 100644--- a/app/src/fps_counter.c+++ b/app/src/fps_counter.c@@ -1,6 +1,7 @@#include "fps_counter.h"#include <assert.h>+#include <stdint.h>#include "util/log.h"diff --git a/app/src/fps_counter.h b/app/src/fps_counter.hindex e7619271..3eab461c 100644--- a/app/src/fps_counter.h+++ b/app/src/fps_counter.h@@ -5,9 +5,9 @@#include <stdatomic.h>#include <stdbool.h>-#include <stdint.h>#include "util/thread.h"+#include "util/tick.h"struct sc_fps_counter {sc_thread thread;diff --git a/app/src/frame_buffer.c b/app/src/frame_buffer.cindex 5699b58f..9fd4cf6f 100644--- a/app/src/frame_buffer.c+++ b/app/src/frame_buffer.c@@ -1,8 +1,6 @@#include "frame_buffer.h"#include <assert.h>-#include <libavutil/avutil.h>-#include <libavformat/avformat.h>#include "util/log.h"diff --git a/app/src/frame_buffer.h b/app/src/frame_buffer.hindex f97261cd..e748adfb 100644--- a/app/src/frame_buffer.h+++ b/app/src/frame_buffer.h@@ -4,6 +4,7 @@#include "common.h"#include <stdbool.h>+#include <libavutil/frame.h>#include "util/thread.h"diff --git a/app/src/hid/hid_event.h b/app/src/hid/hid_event.hindex d6818e30..b0d45ce8 100644--- a/app/src/hid/hid_event.h+++ b/app/src/hid/hid_event.h@@ -3,6 +3,7 @@#include "common.h"+#include <stddef.h>#include <stdint.h>#define SC_HID_MAX_SIZE 15diff --git a/app/src/hid/hid_gamepad.c b/app/src/hid/hid_gamepad.cindex 8f4e4527..842eae9e 100644--- a/app/src/hid/hid_gamepad.c+++ b/app/src/hid/hid_gamepad.c@@ -2,6 +2,8 @@#include <assert.h>#include <inttypes.h>+#include <stddef.h>+#include <sys/types.h>#include "util/binary.h"#include "util/log.h"diff --git a/app/src/hid/hid_gamepad.h b/app/src/hid/hid_gamepad.hindex b532a703..8d939ac7 100644--- a/app/src/hid/hid_gamepad.h+++ b/app/src/hid/hid_gamepad.h@@ -4,6 +4,7 @@#include "common.h"#include <stdbool.h>+#include <stdint.h>#include "hid/hid_event.h"#include "input_events.h"diff --git a/app/src/hid/hid_keyboard.c b/app/src/hid/hid_keyboard.cindex 961ad790..6477396a 100644--- a/app/src/hid/hid_keyboard.c+++ b/app/src/hid/hid_keyboard.c@@ -1,5 +1,6 @@#include "hid_keyboard.h"+#include <assert.h>#include <string.h>#include "util/log.h"diff --git a/app/src/hid/hid_keyboard.h b/app/src/hid/hid_keyboard.hindex cde1ac52..5ecfd8cf 100644--- a/app/src/hid/hid_keyboard.h+++ b/app/src/hid/hid_keyboard.h@@ -4,6 +4,7 @@#include "common.h"#include <stdbool.h>+#include <stdint.h>#include "hid/hid_event.h"#include "input_events.h"diff --git a/app/src/hid/hid_mouse.c b/app/src/hid/hid_mouse.cindex 7acc413b..29cfc594 100644--- a/app/src/hid/hid_mouse.c+++ b/app/src/hid/hid_mouse.c@@ -1,5 +1,7 @@#include "hid_mouse.h"+#include <stdint.h>+// 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position,// 1 byte for wheel motion#define SC_HID_MOUSE_INPUT_SIZE 4diff --git a/app/src/hid/hid_mouse.h b/app/src/hid/hid_mouse.hindex a9a54718..06c61dd1 100644--- a/app/src/hid/hid_mouse.h+++ b/app/src/hid/hid_mouse.h@@ -3,8 +3,6 @@#include "common.h"-#include <stdbool.h>-#include "hid/hid_event.h"#include "input_events.h"diff --git a/app/src/icon.c b/app/src/icon.cindex 4f3a9a39..797afc75 100644--- a/app/src/icon.c+++ b/app/src/icon.c@@ -2,17 +2,22 @@#include <assert.h>#include <stdbool.h>+#include <stdint.h>+#include <stdlib.h>+#include <string.h>#include <libavcodec/avcodec.h>#include <libavformat/avformat.h>+#include <libavutil/avutil.h>#include <libavutil/pixdesc.h>#include <libavutil/pixfmt.h>+#include <SDL2/SDL.h>#include "config.h"-#include "compat.h"#include "util/env.h"-#include "util/file.h"+#ifdef PORTABLE+# include "util/file.h"+#endif#include "util/log.h"-#include "util/str.h"#define SCRCPY_PORTABLE_ICON_FILENAME "icon.png"#define SCRCPY_DEFAULT_ICON_PATH \diff --git a/app/src/icon.h b/app/src/icon.hindex 3251e48f..6bcf46d2 100644--- a/app/src/icon.h+++ b/app/src/icon.h@@ -3,9 +3,7 @@#include "common.h"-#include <stdbool.h>-#include <SDL2/SDL.h>-#include <libavformat/avformat.h>+#include <SDL2/SDL_surface.h>SDL_Surface *scrcpy_icon_load(void);diff --git a/app/src/input_events.h b/app/src/input_events.hindex ad3afa81..0c022acc 100644--- a/app/src/input_events.h+++ b/app/src/input_events.h@@ -9,7 +9,6 @@#include <SDL2/SDL_events.h>#include "coords.h"-#include "options.h"/* The representation of input events in scrcpy is very close to the SDL API,* for simplicity.diff --git a/app/src/input_manager.c b/app/src/input_manager.cindex 2e4337db..635825c9 100644--- a/app/src/input_manager.c+++ b/app/src/input_manager.c@@ -1,8 +1,12 @@#include "input_manager.h"#include <assert.h>-#include <SDL2/SDL_keycode.h>+#include <stdlib.h>+#include <string.h>+#include <SDL2/SDL.h>+#include "android/input.h"+#include "android/keycodes.h"#include "input_events.h"#include "screen.h"#include "shortcut_mod.h"diff --git a/app/src/input_manager.h b/app/src/input_manager.hindex 8efd0153..af4cbc69 100644--- a/app/src/input_manager.h+++ b/app/src/input_manager.h@@ -4,12 +4,12 @@#include "common.h"#include <stdbool.h>--#include <SDL2/SDL.h>+#include <stdint.h>+#include <SDL2/SDL_events.h>+#include <SDL2/SDL_keycode.h>#include "controller.h"#include "file_pusher.h"-#include "fps_counter.h"#include "options.h"#include "trait/gamepad_processor.h"#include "trait/key_processor.h"diff --git a/app/src/keyboard_sdk.c b/app/src/keyboard_sdk.cindex 2d9ca85b..466a1aeb 100644--- a/app/src/keyboard_sdk.c+++ b/app/src/keyboard_sdk.c@@ -1,8 +1,13 @@#include "keyboard_sdk.h"#include <assert.h>+#include <ctype.h>+#include <stdint.h>+#include <stdlib.h>+#include <string.h>#include "android/input.h"+#include "android/keycodes.h"#include "control_msg.h"#include "controller.h"#include "input_events.h"diff --git a/app/src/main.c b/app/src/main.cindex 8bbd074f..c58e0be7 100644--- a/app/src/main.c+++ b/app/src/main.c@@ -1,9 +1,6 @@#include "common.h"-#include <assert.h>#include <stdbool.h>-#include <unistd.h>-#include <libavformat/avformat.h>#ifdef HAVE_V4L2# include <libavdevice/avdevice.h>#endifdiff --git a/app/src/mouse_sdk.c b/app/src/mouse_sdk.cindex a7998972..7eceffa7 100644--- a/app/src/mouse_sdk.c+++ b/app/src/mouse_sdk.c@@ -1,12 +1,12 @@#include "mouse_sdk.h"#include <assert.h>+#include <stdint.h>#include "android/input.h"#include "control_msg.h"#include "controller.h"#include "input_events.h"-#include "util/intmap.h"#include "util/log.h"/** Downcast mouse processor to sc_mouse_sdk */diff --git a/app/src/mouse_sdk.h b/app/src/mouse_sdk.hindex 142b89bb..fe92a2d7 100644--- a/app/src/mouse_sdk.h+++ b/app/src/mouse_sdk.h@@ -6,7 +6,6 @@#include <stdbool.h>#include "controller.h"-#include "screen.h"#include "trait/mouse_processor.h"struct sc_mouse_sdk {diff --git a/app/src/opengl.c b/app/src/opengl.cindex 376690af..0cb83ed7 100644--- a/app/src/opengl.c+++ b/app/src/opengl.c@@ -2,7 +2,8 @@#include <assert.h>#include <stdio.h>-#include "SDL2/SDL.h"+#include <string.h>+#include <SDL2/SDL.h>voidsc_opengl_init(struct sc_opengl *gl) {diff --git a/app/src/options.c b/app/src/options.cindex df8033e9..044aa014 100644--- a/app/src/options.c+++ b/app/src/options.c@@ -1,5 +1,7 @@#include "options.h"+#include <stddef.h>+const struct scrcpy_options scrcpy_options_default = {.serial = NULL,.crop = NULL,diff --git a/app/src/options.h b/app/src/options.hindex 152881d8..c8425808 100644--- a/app/src/options.h+++ b/app/src/options.h@@ -5,7 +5,6 @@#include <assert.h>#include <stdbool.h>-#include <stddef.h>#include <stdint.h>#include "util/tick.h"diff --git a/app/src/packet_merger.c b/app/src/packet_merger.cindex 81b02d2c..dea038b6 100644--- a/app/src/packet_merger.c+++ b/app/src/packet_merger.c@@ -1,5 +1,9 @@#include "packet_merger.h"+#include <stdlib.h>+#include <string.h>+#include <libavutil/avutil.h>+#include "util/log.h"voiddiff --git a/app/src/packet_merger.h b/app/src/packet_merger.hindex e1824c2c..3f9972ce 100644--- a/app/src/packet_merger.h+++ b/app/src/packet_merger.h@@ -5,7 +5,7 @@#include <stdbool.h>#include <stdint.h>-#include <libavcodec/avcodec.h>+#include <libavcodec/packet.h>/*** Config packets (containing the SPS/PPS) are sent in-band. A new configdiff --git a/app/src/receiver.c b/app/src/receiver.cindex b89b0c6e..2ccb8a8b 100644--- a/app/src/receiver.c+++ b/app/src/receiver.c@@ -2,7 +2,6 @@#include <assert.h>#include <inttypes.h>-#include <stdint.h>#include <SDL2/SDL_clipboard.h>#include "device_msg.h"diff --git a/app/src/recorder.c b/app/src/recorder.cindex 15f27157..c26f8f2d 100644--- a/app/src/recorder.c+++ b/app/src/recorder.c@@ -1,6 +1,9 @@#include "recorder.h"#include <assert.h>+#include <inttypes.h>+#include <stdlib.h>+#include <string.h>#include <libavcodec/avcodec.h>#include <libavformat/avformat.h>#include <libavutil/time.h>diff --git a/app/src/recorder.h b/app/src/recorder.hindex d096e79a..70b73836 100644--- a/app/src/recorder.h+++ b/app/src/recorder.h@@ -4,9 +4,10 @@#include "common.h"#include <stdbool.h>+#include <stdint.h>+#include <libavcodec/packet.h>#include <libavformat/avformat.h>-#include "coords.h"#include "options.h"#include "trait/packet_sink.h"#include "util/thread.h"diff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex f1942e43..641d93f7 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -1,10 +1,11 @@#include "scrcpy.h"+#include <assert.h>+#include <inttypes.h>+#include <stdbool.h>#include <stdio.h>+#include <stdlib.h>#include <string.h>-#include <unistd.h>-#include <libavformat/avformat.h>-#include <sys/time.h>#include <SDL2/SDL.h>#ifdef _WIN32@@ -37,9 +38,9 @@#endif#include "util/acksync.h"#include "util/log.h"-#include "util/net.h"#include "util/rand.h"#include "util/timeout.h"+#include "util/tick.h"#ifdef HAVE_V4L2# include "v4l2_sink.h"#endifdiff --git a/app/src/scrcpy.h b/app/src/scrcpy.hindex d4d494a3..7f6a0fb2 100644--- a/app/src/scrcpy.h+++ b/app/src/scrcpy.h@@ -3,7 +3,6 @@#include "common.h"-#include <stdbool.h>#include "options.h"enum scrcpy_exit_code {diff --git a/app/src/screen.h b/app/src/screen.hindex c716c399..6621b2d2 100644--- a/app/src/screen.h+++ b/app/src/screen.h@@ -1,11 +1,14 @@-#ifndef SCREEN_H-#define SCREEN_H+#ifndef SC_SCREEN_H+#define SC_SCREEN_H#include "common.h"#include <stdbool.h>+#include <stdint.h>#include <SDL2/SDL.h>-#include <libavformat/avformat.h>+#include <libavcodec/avcodec.h>+#include <libavutil/frame.h>+#include <libavutil/pixfmt.h>#include "controller.h"#include "coords.h"@@ -14,7 +17,6 @@#include "frame_buffer.h"#include "input_manager.h"#include "mouse_capture.h"-#include "opengl.h"#include "options.h"#include "trait/key_processor.h"#include "trait/frame_sink.h"diff --git a/app/src/server.c b/app/src/server.cindex 22ddd372..cf181abc 100644--- a/app/src/server.c+++ b/app/src/server.c@@ -1,19 +1,18 @@#include "server.h"#include <assert.h>-#include <errno.h>#include <inttypes.h>#include <stdio.h>-#include <SDL2/SDL_timer.h>-#include <SDL2/SDL_platform.h>+#include <stdlib.h>+#include <string.h>+#include <sys/types.h>#include "adb/adb.h"-#include "util/binary.h"#include "util/env.h"#include "util/file.h"#include "util/log.h"#include "util/net_intr.h"-#include "util/process_intr.h"+#include "util/process.h"#include "util/str.h"#define SC_SERVER_FILENAME "scrcpy-server"diff --git a/app/src/server.h b/app/src/server.hindex 3c78b9ed..a03689ff 100644--- a/app/src/server.h+++ b/app/src/server.h@@ -1,19 +1,17 @@-#ifndef SERVER_H-#define SERVER_H+#ifndef SC_SERVER_H+#define SC_SERVER_H#include "common.h"-#include <stdatomic.h>#include <stdbool.h>#include <stdint.h>#include "adb/adb_tunnel.h"-#include "coords.h"#include "options.h"#include "util/intr.h"-#include "util/log.h"#include "util/net.h"#include "util/thread.h"+#include "util/tick.h"#define SC_DEVICE_NAME_FIELD_LENGTH 64struct sc_server_info {diff --git a/app/src/shortcut_mod.h b/app/src/shortcut_mod.hindex b685e987..f6c13f03 100644--- a/app/src/shortcut_mod.h+++ b/app/src/shortcut_mod.h@@ -3,6 +3,7 @@#include "common.h"+#include <assert.h>#include <stdbool.h>#include <stdint.h>#include <SDL2/SDL_keycode.h>diff --git a/app/src/sys/unix/file.c b/app/src/sys/unix/file.cindex 6123c788..8f7fb074 100644--- a/app/src/sys/unix/file.c+++ b/app/src/sys/unix/file.c@@ -1,10 +1,11 @@#include "util/file.h"#include <limits.h>-#include <stdlib.h>#include <stdio.h>+#include <stdlib.h>#include <string.h>#include <sys/stat.h>+#include <sys/types.h>#include <unistd.h>#ifdef __APPLE__# include <mach-o/dyld.h> // for _NSGetExecutablePath()diff --git a/app/src/sys/unix/process.c b/app/src/sys/unix/process.cindex 8c4a53c3..36d1ff7d 100644--- a/app/src/sys/unix/process.c+++ b/app/src/sys/unix/process.c@@ -4,6 +4,8 @@#include <errno.h>#include <fcntl.h>#include <signal.h>+#include <stdio.h>+#include <stdlib.h>#include <sys/types.h>#include <sys/wait.h>#include <unistd.h>diff --git a/app/src/trait/frame_sink.h b/app/src/trait/frame_sink.hindex 8ef248b6..67be4d46 100644--- a/app/src/trait/frame_sink.h+++ b/app/src/trait/frame_sink.h@@ -3,7 +3,6 @@#include "common.h"-#include <assert.h>#include <stdbool.h>#include <libavcodec/avcodec.h>diff --git a/app/src/trait/frame_source.c b/app/src/trait/frame_source.cindex 416eccd9..56848309 100644--- a/app/src/trait/frame_source.c+++ b/app/src/trait/frame_source.c@@ -1,5 +1,7 @@#include "frame_source.h"+#include <assert.h>+voidsc_frame_source_init(struct sc_frame_source *source) {source->sink_count = 0;diff --git a/app/src/trait/frame_source.h b/app/src/trait/frame_source.hindex 94222af0..cb1ef905 100644--- a/app/src/trait/frame_source.h+++ b/app/src/trait/frame_source.h@@ -3,7 +3,9 @@#include "common.h"-#include "frame_sink.h"+#include <stdbool.h>++#include "trait/frame_sink.h"#define SC_FRAME_SOURCE_MAX_SINKS 2diff --git a/app/src/trait/gamepad_processor.h b/app/src/trait/gamepad_processor.hindex 19629a9a..5e8dc2a4 100644--- a/app/src/trait/gamepad_processor.h+++ b/app/src/trait/gamepad_processor.h@@ -3,9 +3,6 @@#include "common.h"-#include <assert.h>-#include <stdbool.h>-#include "input_events.h"/**diff --git a/app/src/trait/key_processor.h b/app/src/trait/key_processor.hindex 96374413..9e9bb86e 100644--- a/app/src/trait/key_processor.h+++ b/app/src/trait/key_processor.h@@ -3,7 +3,6 @@#include "common.h"-#include <assert.h>#include <stdbool.h>#include "input_events.h"diff --git a/app/src/trait/mouse_processor.h b/app/src/trait/mouse_processor.hindex 6e0b596e..d0a96e7c 100644--- a/app/src/trait/mouse_processor.h+++ b/app/src/trait/mouse_processor.h@@ -3,7 +3,6 @@#include "common.h"-#include <assert.h>#include <stdbool.h>#include "input_events.h"diff --git a/app/src/trait/packet_sink.h b/app/src/trait/packet_sink.hindex 84cfe814..e12dea12 100644--- a/app/src/trait/packet_sink.h+++ b/app/src/trait/packet_sink.h@@ -3,7 +3,6 @@#include "common.h"-#include <assert.h>#include <stdbool.h>#include <libavcodec/avcodec.h>diff --git a/app/src/trait/packet_source.c b/app/src/trait/packet_source.cindex c0836f1d..0a2c6c4d 100644--- a/app/src/trait/packet_source.c+++ b/app/src/trait/packet_source.c@@ -1,5 +1,7 @@#include "packet_source.h"+#include <assert.h>+voidsc_packet_source_init(struct sc_packet_source *source) {source->sink_count = 0;diff --git a/app/src/trait/packet_source.h b/app/src/trait/packet_source.hindex 16d56e86..8788021a 100644--- a/app/src/trait/packet_source.h+++ b/app/src/trait/packet_source.h@@ -3,7 +3,9 @@#include "common.h"-#include "packet_sink.h"+#include <stdbool.h>++#include "trait/packet_sink.h"#define SC_PACKET_SOURCE_MAX_SINKS 2diff --git a/app/src/uhid/gamepad_uhid.c b/app/src/uhid/gamepad_uhid.cindex a066cf03..c64feb18 100644--- a/app/src/uhid/gamepad_uhid.c+++ b/app/src/uhid/gamepad_uhid.c@@ -1,5 +1,10 @@#include "gamepad_uhid.h"+#include <assert.h>+#include <inttypes.h>+#include <string.h>+#include <SDL2/SDL_gamecontroller.h>+#include "hid/hid_gamepad.h"#include "input_events.h"#include "util/log.h"diff --git a/app/src/uhid/gamepad_uhid.h b/app/src/uhid/gamepad_uhid.hindex 07d03099..ad747604 100644--- a/app/src/uhid/gamepad_uhid.h+++ b/app/src/uhid/gamepad_uhid.h@@ -3,8 +3,6 @@#include "common.h"-#include <stdbool.h>-#include "controller.h"#include "hid/hid_gamepad.h"#include "trait/gamepad_processor.h"diff --git a/app/src/uhid/keyboard_uhid.c b/app/src/uhid/keyboard_uhid.cindex 76d70cc5..70082990 100644--- a/app/src/uhid/keyboard_uhid.c+++ b/app/src/uhid/keyboard_uhid.c@@ -1,6 +1,12 @@#include "keyboard_uhid.h"+#include <assert.h>+#include <string.h>+#include <SDL2/SDL_keyboard.h>+#include <SDL2/SDL_keycode.h>+#include "util/log.h"+#include "util/thread.h"/** Downcast key processor to keyboard_uhid */#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_uhid, key_processor)diff --git a/app/src/uhid/mouse_uhid.c b/app/src/uhid/mouse_uhid.cindex 471030e7..7fed8383 100644--- a/app/src/uhid/mouse_uhid.c+++ b/app/src/uhid/mouse_uhid.c@@ -1,5 +1,8 @@#include "mouse_uhid.h"+#include <assert.h>+#include <string.h>+#include "hid/hid_mouse.h"#include "input_events.h"#include "util/log.h"diff --git a/app/src/uhid/uhid_output.c b/app/src/uhid/uhid_output.cindex 05e691da..e743a73c 100644--- a/app/src/uhid/uhid_output.c+++ b/app/src/uhid/uhid_output.c@@ -1,6 +1,5 @@#include "uhid_output.h"-#include <assert.h>#include <inttypes.h>#include "uhid/keyboard_uhid.h"diff --git a/app/src/uhid/uhid_output.h b/app/src/uhid/uhid_output.hindex cd6a800f..ed028b58 100644--- a/app/src/uhid/uhid_output.h+++ b/app/src/uhid/uhid_output.h@@ -3,7 +3,7 @@#include "common.h"-#include <stdbool.h>+#include <stddef.h>#include <stdint.h>/**diff --git a/app/src/usb/aoa_hid.c b/app/src/usb/aoa_hid.cindex 236a78ed..8cb62bfd 100644--- a/app/src/usb/aoa_hid.c+++ b/app/src/usb/aoa_hid.c@@ -1,13 +1,16 @@-#include "util/log.h"+#include "aoa_hid.h"#include <assert.h>#include <inttypes.h>#include <stdio.h>+#include <stdlib.h>+#include <sys/types.h>+#include <libusb-1.0/libusb.h>-#include "aoa_hid.h"#include "events.h"#include "util/log.h"#include "util/str.h"+#include "util/tick.h"#include "util/vector.h"// See <https://source.android.com/devices/accessories/aoa2#hid-support>.diff --git a/app/src/usb/aoa_hid.h b/app/src/usb/aoa_hid.hindex 9cc6355e..2755c957 100644--- a/app/src/usb/aoa_hid.h+++ b/app/src/usb/aoa_hid.h@@ -3,16 +3,13 @@#include "common.h"-#include <stdint.h>#include <stdbool.h>--#include <libusb-1.0/libusb.h>+#include <stdint.h>#include "hid/hid_event.h"-#include "usb.h"+#include "usb/usb.h"#include "util/acksync.h"#include "util/thread.h"-#include "util/tick.h"#include "util/vecdeque.h"enum sc_aoa_event_type {diff --git a/app/src/usb/gamepad_aoa.c b/app/src/usb/gamepad_aoa.cindex 4372379f..d29b1a78 100644--- a/app/src/usb/gamepad_aoa.c+++ b/app/src/usb/gamepad_aoa.c@@ -1,5 +1,7 @@#include "gamepad_aoa.h"+#include <stdbool.h>+#include "input_events.h"#include "util/log.h"diff --git a/app/src/usb/gamepad_aoa.h b/app/src/usb/gamepad_aoa.hindex b2dfbe5e..0297a365 100644--- a/app/src/usb/gamepad_aoa.h+++ b/app/src/usb/gamepad_aoa.h@@ -3,10 +3,8 @@#include "common.h"-#include <stdbool.h>--#include "aoa_hid.h"#include "hid/hid_gamepad.h"+#include "usb/aoa_hid.h"#include "trait/gamepad_processor.h"struct sc_gamepad_aoa {diff --git a/app/src/usb/keyboard_aoa.h b/app/src/usb/keyboard_aoa.hindex 565b9177..9e9500a3 100644--- a/app/src/usb/keyboard_aoa.h+++ b/app/src/usb/keyboard_aoa.h@@ -5,8 +5,8 @@#include <stdbool.h>-#include "aoa_hid.h"#include "hid/hid_keyboard.h"+#include "usb/aoa_hid.h"#include "trait/key_processor.h"struct sc_keyboard_aoa {diff --git a/app/src/usb/mouse_aoa.c b/app/src/usb/mouse_aoa.cindex cb566cc0..b64e9b12 100644--- a/app/src/usb/mouse_aoa.c+++ b/app/src/usb/mouse_aoa.c@@ -1,6 +1,7 @@#include "mouse_aoa.h"#include <assert.h>+#include <stddef.h>#include "hid/hid_mouse.h"#include "input_events.h"diff --git a/app/src/usb/mouse_aoa.h b/app/src/usb/mouse_aoa.hindex afaed761..506286ba 100644--- a/app/src/usb/mouse_aoa.h+++ b/app/src/usb/mouse_aoa.h@@ -5,7 +5,7 @@#include <stdbool.h>-#include "aoa_hid.h"+#include "usb/aoa_hid.h"#include "trait/mouse_processor.h"struct sc_mouse_aoa {diff --git a/app/src/usb/scrcpy_otg.c b/app/src/usb/scrcpy_otg.cindex 6ef2fc2a..1a9cc46e 100644--- a/app/src/usb/scrcpy_otg.c+++ b/app/src/usb/scrcpy_otg.c@@ -1,10 +1,19 @@#include "scrcpy_otg.h"+#include <assert.h>+#include <stdbool.h>+#include <stdlib.h>#include <SDL2/SDL.h>-#include "adb/adb.h"+#ifdef _WIN32+# include "adb/adb.h"+#endif#include "events.h"-#include "screen_otg.h"+#include "usb/screen_otg.h"+#include "usb/aoa_hid.h"+#include "usb/gamepad_aoa.h"+#include "usb/keyboard_aoa.h"+#include "usb/mouse_aoa.h"#include "util/log.h"struct scrcpy_otg {diff --git a/app/src/usb/screen_otg.c b/app/src/usb/screen_otg.cindex 368af125..02edc3a3 100644--- a/app/src/usb/screen_otg.c+++ b/app/src/usb/screen_otg.c@@ -1,7 +1,11 @@#include "screen_otg.h"+#include <assert.h>+#include <stddef.h>+#include "icon.h"#include "options.h"+#include "util/acksync.h"#include "util/log.h"static voiddiff --git a/app/src/usb/screen_otg.h b/app/src/usb/screen_otg.hindex 427723ad..08b76ae7 100644--- a/app/src/usb/screen_otg.h+++ b/app/src/usb/screen_otg.h@@ -4,12 +4,13 @@#include "common.h"#include <stdbool.h>+#include <stdint.h>#include <SDL2/SDL.h>-#include "keyboard_aoa.h"-#include "mouse_aoa.h"#include "mouse_capture.h"-#include "gamepad_aoa.h"+#include "usb/gamepad_aoa.h"+#include "usb/keyboard_aoa.h"+#include "usb/mouse_aoa.h"struct sc_screen_otg {struct sc_keyboard_aoa *keyboard;diff --git a/app/src/util/acksync.c b/app/src/util/acksync.cindex 2899cdcb..76ecee0d 100644--- a/app/src/util/acksync.c+++ b/app/src/util/acksync.c@@ -1,7 +1,6 @@#include "acksync.h"#include <assert.h>-#include "util/log.h"boolsc_acksync_init(struct sc_acksync *as) {diff --git a/app/src/util/acksync.h b/app/src/util/acksync.hindex 58ab1b35..3d9c9b2f 100644--- a/app/src/util/acksync.h+++ b/app/src/util/acksync.h@@ -3,7 +3,10 @@#include "common.h"-#include "thread.h"+#include <stdbool.h>+#include <stdint.h>+#include "util/thread.h"+#include "util/tick.h"#define SC_SEQUENCE_INVALID 0diff --git a/app/src/util/audiobuf.h b/app/src/util/audiobuf.hindex 5e7dd4a0..5cc51932 100644--- a/app/src/util/audiobuf.h+++ b/app/src/util/audiobuf.h@@ -6,6 +6,7 @@#include <assert.h>#include <stdatomic.h>#include <stdbool.h>+#include <stddef.h>#include <stdint.h>/**diff --git a/app/src/util/average.h b/app/src/util/average.hindex 59fae7d1..eded9987 100644--- a/app/src/util/average.h+++ b/app/src/util/average.h@@ -3,9 +3,6 @@#include "common.h"-#include <stdbool.h>-#include <stdint.h>-struct sc_average {// Current average valuefloat avg;diff --git a/app/src/util/binary.h b/app/src/util/binary.hindex 7de9b505..b6ce3201 100644--- a/app/src/util/binary.h+++ b/app/src/util/binary.h@@ -4,7 +4,6 @@#include "common.h"#include <assert.h>-#include <stdbool.h>#include <stdint.h>static inline voiddiff --git a/app/src/util/env.c b/app/src/util/env.cindex 1128e5ea..127f5a1f 100644--- a/app/src/util/env.c+++ b/app/src/util/env.c@@ -2,7 +2,9 @@#include <stdlib.h>#include <string.h>-#include "util/str.h"+#ifdef _WIN32+# include "util/str.h"+#endifchar *sc_get_env(const char *varname) {diff --git a/app/src/util/intmap.h b/app/src/util/intmap.hindex 2898c461..7ab903ca 100644--- a/app/src/util/intmap.h+++ b/app/src/util/intmap.h@@ -3,6 +3,7 @@#include "common.h"+#include <stddef.h>#include <stdint.h>struct sc_intmap_entry {diff --git a/app/src/util/intr.c b/app/src/util/intr.cindex 22bd121a..ddf4839f 100644--- a/app/src/util/intr.c+++ b/app/src/util/intr.c@@ -1,9 +1,9 @@#include "intr.h"-#include "util/log.h"-#include <assert.h>+#include "util/log.h"+boolsc_intr_init(struct sc_intr *intr) {bool ok = sc_mutex_init(&intr->mutex);diff --git a/app/src/util/intr.h b/app/src/util/intr.hindex 1c20f6df..35bd3375 100644--- a/app/src/util/intr.h+++ b/app/src/util/intr.h@@ -6,9 +6,9 @@#include <stdatomic.h>#include <stdbool.h>-#include "net.h"-#include "process.h"-#include "thread.h"+#include "util/net.h"+#include "util/process.h"+#include "util/thread.h"/*** Interruptor to wake up a blocking call from another threaddiff --git a/app/src/util/log.c b/app/src/util/log.cindex 8a347c84..9114a258 100644--- a/app/src/util/log.c+++ b/app/src/util/log.c@@ -4,7 +4,10 @@# include <windows.h>#endif#include <assert.h>-#include <libavformat/avformat.h>+#include <stdarg.h>+#include <stdio.h>+#include <stdlib.h>+#include <libavutil/log.h>static SDL_LogPrioritylog_level_sc_to_sdl(enum sc_log_level level) {diff --git a/app/src/util/net.c b/app/src/util/net.cindex d68b0af6..9562ff6b 100644--- a/app/src/util/net.c+++ b/app/src/util/net.c@@ -1,28 +1,27 @@#include "net.h"#include <assert.h>-#include <errno.h>#include <stdio.h>-#include "log.h"-#ifdef _WIN32# include <ws2tcpip.h>typedef int socklen_t;#else-# include <sys/types.h>-# include <sys/socket.h>+# include <arpa/inet.h>+# include <fcntl.h># include <netinet/in.h># include <netinet/tcp.h>-# include <arpa/inet.h># include <unistd.h>-# include <fcntl.h>+# include <sys/socket.h>+# include <sys/types.h># define SOCKET_ERROR -1typedef struct sockaddr_in SOCKADDR_IN;typedef struct sockaddr SOCKADDR;typedef struct in_addr IN_ADDR;#endif+#include "util/log.h"+boolnet_init(void) {#ifdef _WIN32diff --git a/app/src/util/net.h b/app/src/util/net.hindex 94789954..aa99bbc4 100644--- a/app/src/util/net.h+++ b/app/src/util/net.h@@ -4,14 +4,15 @@#include "common.h"#include <stdbool.h>+#include <stddef.h>#include <stdint.h>+#include <sys/types.h>#ifdef _WIN32# include <winsock2.h>typedef SOCKET sc_raw_socket;# define SC_RAW_SOCKET_NONE INVALID_SOCKET#else // not _WIN32-# include <sys/socket.h>typedef int sc_raw_socket;# define SC_RAW_SOCKET_NONE -1#endifdiff --git a/app/src/util/net_intr.h b/app/src/util/net_intr.hindex dbef528d..e2bbee88 100644--- a/app/src/util/net_intr.h+++ b/app/src/util/net_intr.h@@ -3,8 +3,13 @@#include "common.h"-#include "intr.h"-#include "net.h"+#include <stdbool.h>+#include <stddef.h>+#include <stdint.h>+#include <sys/types.h>++#include "util/intr.h"+#include "util/net.h"boolnet_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,diff --git a/app/src/util/process.c b/app/src/util/process.cindex 9c4dcd9f..29d89a54 100644--- a/app/src/util/process.c+++ b/app/src/util/process.c@@ -1,8 +1,6 @@#include "process.h"#include <assert.h>-#include <libgen.h>-#include "log.h"enum sc_process_resultsc_process_execute(const char *const argv[], sc_pid *pid, unsigned flags) {diff --git a/app/src/util/process.h b/app/src/util/process.hindex 4d9d1684..eec51bcc 100644--- a/app/src/util/process.h+++ b/app/src/util/process.h@@ -4,7 +4,9 @@#include "common.h"#include <stdbool.h>+#include <stddef.h>#include "util/thread.h"+#include "util/tick.h"#ifdef _WIN32diff --git a/app/src/util/process_intr.h b/app/src/util/process_intr.hindex 530a9046..020eafa1 100644--- a/app/src/util/process_intr.h+++ b/app/src/util/process_intr.h@@ -3,8 +3,8 @@#include "common.h"-#include "intr.h"-#include "process.h"+#include "util/intr.h"+#include "util/process.h"ssize_tsc_pipe_read_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe, char *data,diff --git a/app/src/util/str.c b/app/src/util/str.cindex 304cd302..83d19c4d 100644--- a/app/src/util/str.c+++ b/app/src/util/str.c@@ -12,8 +12,8 @@# include <tchar.h>#endif-#include "log.h"-#include "strbuf.h"+#include "util/log.h"+#include "util/strbuf.h"size_tsc_strncpy(char *dest, const char *src, size_t n) {diff --git a/app/src/util/str.h b/app/src/util/str.hindex d20f1b28..b386b48d 100644--- a/app/src/util/str.h+++ b/app/src/util/str.h@@ -5,6 +5,8 @@#include <stdbool.h>#include <stddef.h>+#include <stdint.h>+#include <sys/types.h>/* Stringify a numeric value */#define SC_STR(s) SC_XSTR(s)diff --git a/app/src/util/strbuf.c b/app/src/util/strbuf.cindex 1892b46b..6196d746 100644--- a/app/src/util/strbuf.c+++ b/app/src/util/strbuf.c@@ -1,11 +1,10 @@#include "strbuf.h"#include <assert.h>-#include <stdio.h>#include <stdlib.h>#include <string.h>-#include "log.h"+#include "util/log.h"boolsc_strbuf_init(struct sc_strbuf *buf, size_t init_cap) {diff --git a/app/src/util/thread.c b/app/src/util/thread.cindex 9679dfff..2a5253f7 100644--- a/app/src/util/thread.c+++ b/app/src/util/thread.c@@ -1,10 +1,12 @@#include "thread.h"#include <assert.h>+#include <stdint.h>+#include <stdlib.h>#include <string.h>#include <SDL2/SDL_thread.h>-#include "log.h"+#include "util/log.h"sc_thread_id SC_MAIN_THREAD_ID;diff --git a/app/src/util/tick.c b/app/src/util/tick.cindex cc0bab5e..edef1070 100644--- a/app/src/util/tick.c+++ b/app/src/util/tick.c@@ -1,6 +1,7 @@#include "tick.h"#include <assert.h>+#include <stdlib.h>#include <time.h>#ifdef _WIN32# include <windows.h>diff --git a/app/src/util/timeout.c b/app/src/util/timeout.cindex 159a4681..21bc3a53 100644--- a/app/src/util/timeout.c+++ b/app/src/util/timeout.c@@ -1,8 +1,9 @@#include "timeout.h"#include <assert.h>+#include <stddef.h>-#include "log.h"+#include "util/log.h"boolsc_timeout_init(struct sc_timeout *timeout) {diff --git a/app/src/util/timeout.h b/app/src/util/timeout.hindex ae171b86..a45ae2ae 100644--- a/app/src/util/timeout.h+++ b/app/src/util/timeout.h@@ -5,8 +5,8 @@#include <stdbool.h>-#include "thread.h"-#include "tick.h"+#include "util/thread.h"+#include "util/tick.h"struct sc_timeout {sc_thread thread;diff --git a/app/src/util/vecdeque.h b/app/src/util/vecdeque.hindex ce559ee9..e31724e2 100644--- a/app/src/util/vecdeque.h+++ b/app/src/util/vecdeque.h@@ -6,6 +6,7 @@#include <assert.h>#include <stdbool.h>#include <stddef.h>+#include <stdint.h>#include <stdlib.h>#include <string.h>diff --git a/app/src/util/vector.h b/app/src/util/vector.hindex 97d7c389..5b399d56 100644--- a/app/src/util/vector.h+++ b/app/src/util/vector.h@@ -5,8 +5,8 @@#include <stdbool.h>#include <stddef.h>+#include <stdint.h>#include <stdlib.h>-#include <string.h>// Adapted from vlc_vector:// <https://code.videolan.org/videolan/vlc/-/blob/0857947abaed9c89810cd96353aaa1b7e6ba3b0d/include/vlc_vector.h>diff --git a/app/src/v4l2_sink.c b/app/src/v4l2_sink.cindex 087e9af4..da9e02ef 100644--- a/app/src/v4l2_sink.c+++ b/app/src/v4l2_sink.c@@ -1,5 +1,9 @@#include "v4l2_sink.h"+#include <assert.h>+#include <errno.h>+#include <stdint.h>+#include <stdlib.h>#include <string.h>#include "util/log.h"diff --git a/app/src/v4l2_sink.h b/app/src/v4l2_sink.hindex 365a739d..2b7c5b50 100644--- a/app/src/v4l2_sink.h+++ b/app/src/v4l2_sink.h@@ -3,13 +3,13 @@#include "common.h"+#include <stdbool.h>#include <libavcodec/avcodec.h>#include <libavformat/avformat.h>-#include "coords.h"-#include "trait/frame_sink.h"#include "frame_buffer.h"-#include "util/tick.h"+#include "trait/frame_sink.h"+#include "util/thread.h"struct sc_v4l2_sink {struct sc_frame_sink frame_sink; // frame sink traitdiff --git a/app/src/version.c b/app/src/version.cindex 90ea3334..f8610714 100644--- a/app/src/version.c+++ b/app/src/version.c@@ -1,5 +1,6 @@#include "version.h"+#include <stdio.h>#include <libavcodec/avcodec.h>#include <libavformat/avformat.h>#include <libavutil/avutil.h>@@ -9,6 +10,7 @@#ifdef HAVE_USB# include <libusb-1.0/libusb.h>#endif+#include <SDL2/SDL_version.h>voidscrcpy_print_version(void) {