Group common includes into common.h

Include config.h and compat.h in common.h, and include common.h from all
source files.

app/src/adb.c

@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
-#include "common.h"
 #include "util/log.h"
 #include "util/str_util.h"
 

app/src/adb.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
-#include "config.h"
+#include "common.h"
 
 #include "util/process.h"
 

app/src/cli.c

@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "scrcpy.h"
 #include "util/log.h"
 #include "util/str_util.h"

app/src/cli.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "config.h"
+#include "common.h"
 #include "scrcpy.h"
 
 struct scrcpy_cli_args {

app/src/common.h

@@ -2,6 +2,7 @@
 #define COMMON_H
 
 #include "config.h"
+#include "compat.h"
 
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)

app/src/control_msg.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "config.h"
 #include "util/buffer_util.h"
 #include "util/log.h"
 #include "util/str_util.h"

app/src/control_msg.h

@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "config.h"
+#include "common.h"
 #include "android/input.h"
 #include "android/keycodes.h"
 #include "coords.h"

app/src/controller.c

@@ -2,7 +2,6 @@
 
 #include <assert.h>
 
-#include "config.h"
 #include "util/lock.h"
 #include "util/log.h"
 

app/src/controller.h

@@ -5,7 +5,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 #include "control_msg.h"
 #include "receiver.h"
 #include "util/cbuf.h"

app/src/decoder.c

@@ -7,8 +7,6 @@
 #include <SDL2/SDL_thread.h>
 #include <unistd.h>
 
-#include "config.h"
-#include "compat.h"
 #include "events.h"
 #include "recorder.h"
 #include "video_buffer.h"

app/src/decoder.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <libavformat/avformat.h>
 
-#include "config.h"
+#include "common.h"
 
 struct video_buffer;
 

app/src/device.c

@@ -1,6 +1,5 @@
 #include "device.h"
 
-#include "config.h"
 #include "util/log.h"
 
 bool

app/src/device.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "config.h"
+#include "common.h"
 #include "coords.h"
 #include "util/net.h"
 

app/src/device_msg.c

@@ -2,7 +2,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "util/buffer_util.h"
 #include "util/log.h"
 

app/src/device_msg.h

@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include "config.h"
+#include "common.h"
 
 #define DEVICE_MSG_MAX_SIZE (1 << 18) // 256k
 // type: 1 byte; length: 4 bytes

app/src/event_converter.c

@@ -1,7 +1,5 @@
 #include "event_converter.h"
 
-#include "config.h"
-
 #define MAP(FROM, TO) case FROM: *to = TO; return true
 #define FAIL default: return false
 

app/src/event_converter.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <SDL2/SDL_events.h>
 
-#include "config.h"
+#include "common.h"
 #include "control_msg.h"
 
 bool

app/src/file_handler.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "config.h"
 #include "adb.h"
 #include "util/lock.h"
 #include "util/log.h"

app/src/file_handler.h

@@ -5,7 +5,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 #include "adb.h"
 #include "util/cbuf.h"
 

app/src/fps_counter.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <SDL2/SDL_timer.h>
 
-#include "config.h"
 #include "util/lock.h"
 #include "util/log.h"
 

app/src/fps_counter.h

@@ -7,7 +7,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 
 struct fps_counter {
     SDL_Thread *thread;

app/src/input_manager.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <SDL2/SDL_keycode.h>
 
-#include "config.h"
 #include "event_converter.h"
 #include "util/lock.h"
 #include "util/log.h"

app/src/input_manager.h

@@ -5,7 +5,7 @@
 
 #include <SDL2/SDL.h>
 
-#include "config.h"
+#include "common.h"
 #include "controller.h"
 #include "fps_counter.h"
 #include "scrcpy.h"

app/src/main.c

@@ -7,9 +7,8 @@
 #define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem
 #include <SDL2/SDL.h>
 
-#include "config.h"
+#include "common.h"
 #include "cli.h"
-#include "compat.h"
 #include "util/log.h"
 
 static void

app/src/opengl.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <SDL2/SDL_opengl.h>
 
-#include "config.h"
+#include "common.h"
 
 struct sc_opengl {
     const char *version;

app/src/receiver.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <SDL2/SDL_clipboard.h>
 
-#include "config.h"
 #include "device_msg.h"
 #include "util/lock.h"
 #include "util/log.h"

app/src/receiver.h

@@ -5,7 +5,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 #include "util/net.h"
 
 // receive events from the device

app/src/recorder.c

@@ -3,8 +3,6 @@
 #include <assert.h>
 #include <libavutil/time.h>
 
-#include "config.h"
-#include "compat.h"
 #include "util/lock.h"
 #include "util/log.h"
 

app/src/recorder.h

@@ -6,7 +6,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 #include "coords.h"
 #include "scrcpy.h"
 #include "util/queue.h"

app/src/scrcpy.c

@@ -13,8 +13,6 @@
 # include <windows.h>
 #endif
 
-#include "config.h"
-#include "compat.h"
 #include "controller.h"
 #include "decoder.h"
 #include "device.h"

app/src/scrcpy.h

@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "config.h"
+#include "common.h"
 
 enum sc_log_level {
     SC_LOG_LEVEL_DEBUG,

app/src/screen.c

@@ -4,9 +4,6 @@
 #include <string.h>
 #include <SDL2/SDL.h>
 
-#include "config.h"
-#include "common.h"
-#include "compat.h"
 #include "icon.xpm"
 #include "scrcpy.h"
 #include "tiny_xpm.h"

app/src/screen.h

@@ -5,7 +5,7 @@
 #include <SDL2/SDL.h>
 #include <libavformat/avformat.h>
 
-#include "config.h"
+#include "common.h"
 #include "coords.h"
 #include "opengl.h"
 

app/src/server.c

@@ -9,7 +9,6 @@
 #include <SDL2/SDL_timer.h>
 #include <SDL2/SDL_platform.h>
 
-#include "config.h"
 #include "adb.h"
 #include "util/lock.h"
 #include "util/log.h"

app/src/server.h

@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 #include "adb.h"
 #include "scrcpy.h"
 #include "util/log.h"

app/src/stream.c

@@ -8,8 +8,6 @@
 #include <SDL2/SDL_thread.h>
 #include <unistd.h>
 
-#include "config.h"
-#include "compat.h"
 #include "decoder.h"
 #include "events.h"
 #include "recorder.h"

app/src/stream.h

@@ -7,7 +7,7 @@
 #include <SDL2/SDL_atomic.h>
 #include <SDL2/SDL_thread.h>
 
-#include "config.h"
+#include "common.h"
 #include "util/net.h"
 
 struct video_buffer;

app/src/sys/unix/process.c

@@ -11,8 +11,6 @@
 
 #include "util/process.h"
 
-#include "config.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

app/src/sys/win/process.c

@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include "config.h"
 #include "util/log.h"
 #include "util/str_util.h"
 

app/src/tiny_xpm.c

@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
 #include "util/log.h"
 
 struct index {

app/src/tiny_xpm.h

@@ -3,7 +3,7 @@
 
 #include <SDL2/SDL.h>
 
-#include "config.h"
+#include "common.h"
 
 SDL_Surface *
 read_xpm(char *xpm[]);

app/src/util/buffer_util.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "config.h"
+#include "common.h"
 
 static inline void
 buffer_write16be(uint8_t *buf, uint16_t value) {

app/src/util/cbuf.h

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "config.h"
+#include "common.h"
 
 // To define a circular buffer type of 20 ints:
 //     struct cbuf_int CBUF(int, 20);

app/src/util/lock.h

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <SDL2/SDL_mutex.h>
 
-#include "config.h"
+#include "common.h"
 #include "log.h"
 
 static inline void

app/src/util/net.c

@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <SDL2/SDL_platform.h>
 
-#include "config.h"
 #include "log.h"
 
 #ifdef __WINDOWS__

app/src/util/net.h

@@ -17,7 +17,7 @@
   typedef int socket_t;
 #endif
 
-#include "config.h"
+#include "common.h"
 
 bool
 net_init(void);

app/src/util/process.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "config.h"
+#include "common.h"
 
 #ifdef _WIN32
 

app/src/util/queue.h

@@ -6,7 +6,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "config.h"
+#include "common.h"
 
 // To define a queue type of "struct foo":
 //    struct queue_foo QUEUE(struct foo);

app/src/util/str_util.c

@@ -12,8 +12,6 @@
 
 #include <SDL2/SDL_stdinc.h>
 
-#include "config.h"
-
 size_t
 xstrncpy(char *dest, const char *src, size_t n) {
     size_t i;

app/src/util/str_util.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "config.h"
+#include "common.h"
 
 // like strncpy, except:
 //  - it copies at most n-1 chars

app/src/video_buffer.c

@@ -5,7 +5,6 @@
 #include <libavutil/avutil.h>
 #include <libavformat/avformat.h>
 
-#include "config.h"
 #include "util/lock.h"
 #include "util/log.h"
 

app/src/video_buffer.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <SDL2/SDL_mutex.h>
 
-#include "config.h"
+#include "common.h"
 #include "fps_counter.h"
 
 // forward declarations

app/tests/test_cli.c

@@ -1,8 +1,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "cli.h"
 #include "common.h"
+#include "cli.h"
 #include "scrcpy.h"
 
 static void test_flag_version(void) {