From 197c0c70dac3ca01c8492bd7d3cd414a5de7f77d Mon Sep 17 00:00:00 2001 From: klemek Date: Sat, 8 Nov 2025 14:29:37 +0100 Subject: [PATCH] refactor: clean includes --- src/args.c | 3 ++- src/arr.c | 2 ++ src/config_file.c | 3 ++- src/file.c | 3 ++- src/forge.c | 3 ++- src/main.c | 3 ++- src/midi.c | 3 ++- src/shaders.c | 2 -- src/shared.c | 3 ++- src/state.c | 3 ++- src/tempo.c | 2 ++ src/timer.c | 3 ++- src/video.c | 3 ++- src/window.c | 1 + 14 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/args.c b/src/args.c index 9ee6ce6..957830c 100644 --- a/src/args.c +++ b/src/args.c @@ -5,10 +5,11 @@ #include #include +#include "types.h" + #include "args.h" #include "config.h" #include "string.h" -#include "types.h" static void print_help(int status_code) { puts(PACKAGE diff --git a/src/arr.c b/src/arr.c index 47e4626..3f82742 100644 --- a/src/arr.c +++ b/src/arr.c @@ -1,3 +1,5 @@ +#include "types.h" + #include "arr.h" unsigned int arr_uint_index_of(UintArray array, unsigned int value) { diff --git a/src/config_file.c b/src/config_file.c index 7f9d73e..d361d4c 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -3,11 +3,12 @@ #include #include +#include "types.h" + #include "config.h" #include "config_file.h" #include "file.h" #include "string.h" -#include "types.h" static int item_compare(const void *a, const void *b, __attribute__((unused)) void *udata) { diff --git a/src/file.c b/src/file.c index d4089b4..d09e0e0 100644 --- a/src/file.c +++ b/src/file.c @@ -5,9 +5,10 @@ #include #include +#include "types.h" + #include "file.h" #include "string.h" -#include "types.h" static time_t get_file_time(File file) { struct stat attr; diff --git a/src/forge.c b/src/forge.c index f2566b5..cee82a0 100644 --- a/src/forge.c +++ b/src/forge.c @@ -6,6 +6,8 @@ #include #include +#include "types.h" + #include "config.h" #include "config_file.h" #include "file.h" @@ -16,7 +18,6 @@ #include "state.h" #include "tempo.h" #include "timer.h" -#include "types.h" #include "video.h" #include "window.h" diff --git a/src/main.c b/src/main.c index 52aa713..4dcf122 100644 --- a/src/main.c +++ b/src/main.c @@ -2,12 +2,13 @@ #include #include +#include "types.h" + #include "args.h" #include "config.h" #include "forge.h" #include "main.h" #include "rand.h" -#include "types.h" int main(int argc, char **argv) { Parameters params; diff --git a/src/midi.c b/src/midi.c index 94b5a14..e6a2f46 100644 --- a/src/midi.c +++ b/src/midi.c @@ -1,9 +1,10 @@ #include #include +#include "types.h" + #include "config.h" #include "log.h" -#include "types.h" MidiDevice midi_open(char *name) { MidiDevice device; diff --git a/src/shaders.c b/src/shaders.c index 69ad51e..4db4a89 100644 --- a/src/shaders.c +++ b/src/shaders.c @@ -5,12 +5,10 @@ #include "types.h" -#include "arr.h" #include "config.h" #include "config_file.h" #include "constants.h" #include "shaders.h" -#include "tempo.h" #define GLAD_GL_IMPLEMENTATION #include diff --git a/src/shared.c b/src/shared.c index 5304747..1c3a8c0 100644 --- a/src/shared.c +++ b/src/shared.c @@ -3,9 +3,10 @@ #include #include -#include "shared.h" #include "types.h" +#include "shared.h" + static void *open_shared(const char *key, size_t size, int *fd) { *fd = shm_open(key, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR); ftruncate(*fd, size); diff --git a/src/state.c b/src/state.c index 78ecc3a..2d8f269 100644 --- a/src/state.c +++ b/src/state.c @@ -1,6 +1,8 @@ #include #include +#include "types.h" + #include "arr.h" #include "config.h" #include "config_file.h" @@ -9,7 +11,6 @@ #include "rand.h" #include "state.h" #include "tempo.h" -#include "types.h" StateConfig state_parse_config(ConfigFile config) { unsigned int i, j, offset, count; diff --git a/src/tempo.c b/src/tempo.c index dcbbd18..f3fe654 100644 --- a/src/tempo.c +++ b/src/tempo.c @@ -2,6 +2,8 @@ #include #include +#include "types.h" + #include "config.h" #include "tempo.h" diff --git a/src/timer.c b/src/timer.c index 6054828..e5501f7 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,8 +1,9 @@ #include -#include "timer.h" #include "types.h" +#include "timer.h" + Timer timer_init(const unsigned int target) { Timer output; diff --git a/src/video.c b/src/video.c index 0ce5a62..0cba23d 100644 --- a/src/video.c +++ b/src/video.c @@ -8,9 +8,10 @@ #include #include +#include "types.h" + #include "config.h" #include "timer.h" -#include "types.h" #include "video.h" static void ioctl_error(VideoCapture *video_capture, const char *operation, diff --git a/src/window.c b/src/window.c index 0069787..cfc2499 100644 --- a/src/window.c +++ b/src/window.c @@ -4,6 +4,7 @@ #include #include "types.h" + #include "window.h" static void init_glfw(void (*error_callback)(int, const char *)) {