From 46dc96436a1984096a6dfc4832dcae910db91ad9 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Fri, 4 Mar 2022 09:44:27 +0100
Subject: [PATCH] Remove system includes from common.h

Avoiding obscure include order problems.
---
 src/lib/api.c                         | 6 ++++--
 src/lib/asm_c.c                       | 2 ++
 src/lib/blend.c                       | 3 +++
 src/lib/color_helpers.c               | 6 +++++-
 src/lib/color_helpers.h               | 2 --
 src/lib/colormod.c                    | 2 ++
 src/lib/common.h                      | 7 -------
 src/lib/debug.c                       | 3 +++
 src/lib/file.h                        | 3 +--
 src/lib/filter.c                      | 2 ++
 src/lib/filter.h                      | 2 --
 src/lib/font_draw.c                   | 3 +--
 src/lib/font_load.c                   | 3 +--
 src/lib/font_main.c                   | 3 +--
 src/lib/font_query.c                  | 3 +--
 src/lib/grad.c                        | 1 +
 src/lib/image.c                       | 4 +++-
 src/lib/image.h                       | 4 ++++
 src/lib/line.c                        | 2 ++
 src/lib/loaders.c                     | 1 +
 src/lib/modules.c                     | 4 +++-
 src/lib/object.c                      | 2 ++
 src/lib/polygon.c                     | 3 +++
 src/lib/rgbadraw.c                    | 2 ++
 src/lib/rotate.c                      | 2 ++
 src/lib/scale.c                       | 2 ++
 src/lib/script.c                      | 2 +-
 src/lib/span.c                        | 2 ++
 src/lib/updates.c                     | 3 +++
 src/lib/updates.h                     | 2 --
 src/lib/x11_color.c                   | 1 +
 src/lib/x11_context.c                 | 1 +
 src/lib/x11_pixmap.c                  | 2 ++
 src/lib/x11_rend.c                    | 2 ++
 src/lib/x11_rgba.c                    | 2 ++
 src/lib/x11_ximage.c                  | 3 +++
 src/lib/x11_ximage.h                  | 2 --
 src/modules/filters/filter_bumpmap.c  | 3 ++-
 src/modules/filters/filter_colormod.c | 3 ++-
 src/modules/filters/filter_common.h   | 1 -
 src/modules/filters/filter_test.c     | 1 +
 src/modules/loaders/loader_common.h   | 3 +--
 42 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/src/lib/api.c b/src/lib/api.c
index 1b85af3..50f4b3d 100644
--- a/src/lib/api.c
+++ b/src/lib/api.c
@@ -1,14 +1,16 @@
 #include "config.h"
 #include <Imlib2.h>
+#include "common.h"
 
 #include <math.h>
-#include <string.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "blend.h"
 #include "colormod.h"
 #include "color_helpers.h"
-#include "common.h"
 #include "dynamic_filters.h"
 #include "file.h"
 #include "filter.h"
diff --git a/src/lib/asm_c.c b/src/lib/asm_c.c
index 05540aa..b41a023 100644
--- a/src/lib/asm_c.c
+++ b/src/lib/asm_c.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+
 #include "asm_c.h"
 
 #if defined(DO_MMX_ASM) || defined(DO_AMD64_ASM)
diff --git a/src/lib/blend.c b/src/lib/blend.c
index 6e56a16..76a087f 100644
--- a/src/lib/blend.c
+++ b/src/lib/blend.c
@@ -1,5 +1,8 @@
 #include "common.h"
 
+#include <math.h>
+#include <stdlib.h>
+
 #include "asm_c.h"
 #include "blend.h"
 #include "colormod.h"
diff --git a/src/lib/color_helpers.c b/src/lib/color_helpers.c
index 6e01bbe..9ac3037 100644
--- a/src/lib/color_helpers.c
+++ b/src/lib/color_helpers.c
@@ -1,8 +1,12 @@
-#include "color_helpers.h"
 /*
  * Color space conversion helper routines
  * Convert between rgb and hsv and between rgb and hls
  */
+#include "common.h"
+
+#include <math.h>
+
+#include "color_helpers.h"
 
 void
 __imlib_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v)
diff --git a/src/lib/color_helpers.h b/src/lib/color_helpers.h
index 4579f3e..15543db 100644
--- a/src/lib/color_helpers.h
+++ b/src/lib/color_helpers.h
@@ -1,8 +1,6 @@
 #ifndef __COLOR_HELPERS
 #define __COLOR_HELPERS 1
 
-#include "common.h"
-
 void                __imlib_rgb_to_hsv(int r, int g, int b, float *hue,
                                        float *saturation, float *value);
 void                __imlib_hsv_to_rgb(float hue, float saturation, float value,
diff --git a/src/lib/colormod.c b/src/lib/colormod.c
index 7e99fdb..25b0013 100644
--- a/src/lib/colormod.c
+++ b/src/lib/colormod.c
@@ -1,6 +1,8 @@
 #include "common.h"
 
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "blend.h"
 #include "colormod.h"
diff --git a/src/lib/common.h b/src/lib/common.h
index 95ced4f..556f60e 100644
--- a/src/lib/common.h
+++ b/src/lib/common.h
@@ -3,13 +3,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <math.h>
-#include <time.h>
-
 #if __GNUC__
 #define __PRINTF_N__(no)  __attribute__((__format__(__printf__, (no), (no)+1)))
 #else
diff --git a/src/lib/debug.c b/src/lib/debug.c
index dcd0fca..27f665e 100644
--- a/src/lib/debug.c
+++ b/src/lib/debug.c
@@ -1,5 +1,8 @@
 #include "common.h"
+
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "debug.h"
 
diff --git a/src/lib/file.h b/src/lib/file.h
index 7265d14..f378bb8 100644
--- a/src/lib/file.h
+++ b/src/lib/file.h
@@ -1,10 +1,9 @@
 #ifndef __FILE_H
 #define __FILE_H 1
 
+#include <time.h>
 #include <sys/stat.h>
 
-#include "common.h"
-
 int                 __imlib_IsRealFile(const char *s);
 char               *__imlib_FileKey(const char *file);
 char               *__imlib_FileRealFile(const char *file);
diff --git a/src/lib/filter.c b/src/lib/filter.c
index 3942ec7..94cc9af 100644
--- a/src/lib/filter.c
+++ b/src/lib/filter.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+
 #include "blend.h"
 #include "colormod.h"
 #include "filter.h"
diff --git a/src/lib/filter.h b/src/lib/filter.h
index 57d7df1..2d7bf77 100644
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -1,8 +1,6 @@
 #ifndef __FILTER
 #define __FILTER 1
 
-#include "common.h"
-
 typedef struct {
    int                 xoff, yoff;
    int                 a, r, g, b;
diff --git a/src/lib/font_draw.c b/src/lib/font_draw.c
index 53030c1..45fba3f 100644
--- a/src/lib/font_draw.c
+++ b/src/lib/font_draw.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "common.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -9,7 +9,6 @@
 
 #include "blend.h"
 #include "colormod.h"
-#include "common.h"
 #include "font.h"
 #include "image.h"
 #include "rgbadraw.h"
diff --git a/src/lib/font_load.c b/src/lib/font_load.c
index 26ddad9..9abe41b 100644
--- a/src/lib/font_load.c
+++ b/src/lib/font_load.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "common.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -9,7 +9,6 @@
 
 #include "blend.h"
 #include "colormod.h"
-#include "common.h"
 #include "file.h"
 #include "font.h"
 #include "image.h"
diff --git a/src/lib/font_main.c b/src/lib/font_main.c
index 7c823ac..766f80f 100644
--- a/src/lib/font_main.c
+++ b/src/lib/font_main.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "common.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -9,7 +9,6 @@
 
 #include "blend.h"
 #include "colormod.h"
-#include "common.h"
 #include "font.h"
 #include "image.h"
 #include "rgbadraw.h"
diff --git a/src/lib/font_query.c b/src/lib/font_query.c
index a67f62b..4ebad1e 100644
--- a/src/lib/font_query.c
+++ b/src/lib/font_query.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "common.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -9,7 +9,6 @@
 
 #include "blend.h"
 #include "colormod.h"
-#include "common.h"
 #include "image.h"
 #include "font.h"
 #include "rgbadraw.h"
diff --git a/src/lib/grad.c b/src/lib/grad.c
index 967bdd2..16b4bbc 100644
--- a/src/lib/grad.c
+++ b/src/lib/grad.c
@@ -1,6 +1,7 @@
 #include "common.h"
 
 #include <math.h>
+#include <stdlib.h>
 
 #include "blend.h"
 #include "colormod.h"
diff --git a/src/lib/image.c b/src/lib/image.c
index fbaaa11..ce18ea6 100644
--- a/src/lib/image.c
+++ b/src/lib/image.c
@@ -1,15 +1,17 @@
 #include "config.h"
 #include <Imlib2.h>
+#include "common.h"
 
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "common.h"
 #include "debug.h"
 #include "file.h"
 #include "image.h"
diff --git a/src/lib/image.h b/src/lib/image.h
index bf0914f..4a01859 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -1,6 +1,10 @@
 #ifndef __IMAGE
 #define __IMAGE 1
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
 #include "common.h"
 
 typedef struct _imlibldctx ImlibLdCtx;
diff --git a/src/lib/line.c b/src/lib/line.c
index 1405f55..75f4946 100644
--- a/src/lib/line.c
+++ b/src/lib/line.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+
 #include "blend.h"
 #include "colormod.h"
 #include "image.h"
diff --git a/src/lib/loaders.c b/src/lib/loaders.c
index 1678cd1..4fad851 100644
--- a/src/lib/loaders.c
+++ b/src/lib/loaders.c
@@ -1,6 +1,7 @@
 #include "common.h"
 
 #include <dlfcn.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/src/lib/modules.c b/src/lib/modules.c
index d7afbb6..b0109fe 100644
--- a/src/lib/modules.c
+++ b/src/lib/modules.c
@@ -1,6 +1,8 @@
-#include "config.h"
+#include "common.h"
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "file.h"
 #include "image.h"
diff --git a/src/lib/object.c b/src/lib/object.c
index ec3cf52..3a43dbe 100644
--- a/src/lib/object.c
+++ b/src/lib/object.c
@@ -1,3 +1,5 @@
+#include "common.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/lib/polygon.c b/src/lib/polygon.c
index 918fcdf..b0aa8eb 100644
--- a/src/lib/polygon.c
+++ b/src/lib/polygon.c
@@ -1,5 +1,8 @@
 #include "common.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "blend.h"
 #include "colormod.h"
 #include "image.h"
diff --git a/src/lib/rgbadraw.c b/src/lib/rgbadraw.c
index 670ebcd..8a6748a 100644
--- a/src/lib/rgbadraw.c
+++ b/src/lib/rgbadraw.c
@@ -1,6 +1,8 @@
 #include "common.h"
 
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "blend.h"
 #include "colormod.h"
diff --git a/src/lib/rotate.c b/src/lib/rotate.c
index 7c9a1d0..6df65d4 100644
--- a/src/lib/rotate.c
+++ b/src/lib/rotate.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+
 #include "asm_c.h"
 #include "blend.h"
 #include "rotate.h"
diff --git a/src/lib/scale.c b/src/lib/scale.c
index 22be22f..d104344 100644
--- a/src/lib/scale.c
+++ b/src/lib/scale.c
@@ -1,6 +1,8 @@
 #include "common.h"
 
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "asm_c.h"
 #include "blend.h"
diff --git a/src/lib/script.c b/src/lib/script.c
index 855a749..ff56c8a 100644
--- a/src/lib/script.c
+++ b/src/lib/script.c
@@ -1,5 +1,6 @@
 #include "config.h"
 #include <Imlib2.h>
+#include "common.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -12,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "common.h"
 #include "dynamic_filters.h"
 #include "image.h"
 #include "script.h"
diff --git a/src/lib/span.c b/src/lib/span.c
index c8ce3d9..2ab920a 100644
--- a/src/lib/span.c
+++ b/src/lib/span.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stddef.h>
+
 #include "blend.h"
 #include "colormod.h"
 #include "image.h"
diff --git a/src/lib/updates.c b/src/lib/updates.c
index 6f04cb0..ba7ca09 100644
--- a/src/lib/updates.c
+++ b/src/lib/updates.c
@@ -1,5 +1,8 @@
 #include "common.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "updates.h"
 
 enum _t_used {
diff --git a/src/lib/updates.h b/src/lib/updates.h
index 7736b50..ed2b250 100644
--- a/src/lib/updates.h
+++ b/src/lib/updates.h
@@ -1,8 +1,6 @@
 #ifndef __UPDATES
 #define __UPDATES 1
 
-#include "common.h"
-
 typedef struct _ImlibUpdate {
    int                 x, y, w, h;
    struct _ImlibUpdate *next;
diff --git a/src/lib/x11_color.c b/src/lib/x11_color.c
index 1fc8733..7dc95b3 100644
--- a/src/lib/x11_color.c
+++ b/src/lib/x11_color.c
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/src/lib/x11_context.c b/src/lib/x11_context.c
index 0a70225..248bfe2 100644
--- a/src/lib/x11_context.c
+++ b/src/lib/x11_context.c
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#include <stdlib.h>
 #include <X11/Xlib.h>
 
 #include "image.h"
diff --git a/src/lib/x11_pixmap.c b/src/lib/x11_pixmap.c
index a147087..566c8e1 100644
--- a/src/lib/x11_pixmap.c
+++ b/src/lib/x11_pixmap.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <X11/Xlib.h>
 
 #include "x11_pixmap.h"
diff --git a/src/lib/x11_rend.c b/src/lib/x11_rend.c
index eb85e2f..bbece55 100644
--- a/src/lib/x11_rend.c
+++ b/src/lib/x11_rend.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
diff --git a/src/lib/x11_rgba.c b/src/lib/x11_rgba.c
index c05f3dc..6bdd88f 100644
--- a/src/lib/x11_rgba.c
+++ b/src/lib/x11_rgba.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <X11/Xlib.h>
 
 #include "asm_c.h"
diff --git a/src/lib/x11_ximage.c b/src/lib/x11_ximage.c
index f271bf7..d58fc89 100644
--- a/src/lib/x11_ximage.c
+++ b/src/lib/x11_ximage.c
@@ -1,5 +1,8 @@
 #include "common.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
 #include <X11/Xutil.h>
diff --git a/src/lib/x11_ximage.h b/src/lib/x11_ximage.h
index fef27dc..6dab9db 100644
--- a/src/lib/x11_ximage.h
+++ b/src/lib/x11_ximage.h
@@ -4,8 +4,6 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
 
-#include "common.h"
-
 void                __imlib_SetXImageCacheCountMax(Display * d, int num);
 int                 __imlib_GetXImageCacheCountMax(Display * d);
 int                 __imlib_GetXImageCacheCountUsed(Display * d);
diff --git a/src/modules/filters/filter_bumpmap.c b/src/modules/filters/filter_bumpmap.c
index 5bb6921..10118ab 100644
--- a/src/modules/filters/filter_bumpmap.c
+++ b/src/modules/filters/filter_bumpmap.c
@@ -1,8 +1,9 @@
 #include "config.h"
 #include <Imlib2.h>
 
-#include <string.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "filter_common.h"
 #include "colormod.h"
diff --git a/src/modules/filters/filter_colormod.c b/src/modules/filters/filter_colormod.c
index 70363f0..0e4d8a6 100644
--- a/src/modules/filters/filter_colormod.c
+++ b/src/modules/filters/filter_colormod.c
@@ -1,8 +1,9 @@
 #include "config.h"
 #include <Imlib2.h>
 
-#include <string.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "filter_common.h"
 
diff --git a/src/modules/filters/filter_common.h b/src/modules/filters/filter_common.h
index e47863c..720b226 100644
--- a/src/modules/filters/filter_common.h
+++ b/src/modules/filters/filter_common.h
@@ -1,7 +1,6 @@
 #ifndef __FILTER_COMMON_H
 #define __FILTER_COMMON_H 1
 
-#include "config.h"
 #include "common.h"
 #include "dynamic_filters.h"
 #include "image.h"
diff --git a/src/modules/filters/filter_test.c b/src/modules/filters/filter_test.c
index 720dace..745153d 100644
--- a/src/modules/filters/filter_test.c
+++ b/src/modules/filters/filter_test.c
@@ -1,6 +1,7 @@
 #include "config.h"
 #include <Imlib2.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "filter_common.h"
diff --git a/src/modules/loaders/loader_common.h b/src/modules/loaders/loader_common.h
index f4d8b09..17f4b71 100644
--- a/src/modules/loaders/loader_common.h
+++ b/src/modules/loaders/loader_common.h
@@ -1,14 +1,13 @@
 #ifndef __LOADER_COMMON_H
 #define __LOADER_COMMON_H 1
 
-#include "config.h"
+#include "common.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "common.h"
 #include "debug.h"
 #include "image.h"
 #include "loaders.h"