Header file cleanups.

src/lib/api.c

@@ -1,4 +1,10 @@
 #include "config.h"
+
+#include <math.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -6,45 +12,33 @@
 #else
 #define X_DISPLAY_MISSING
 #endif
-#include <string.h>
-#include <stdarg.h>
-#include "common.h"
-#include "colormod.h"
-#include "image.h"
-#include "scale.h"
+
+#include "Imlib2.h"
 #include "blend.h"
+#include "colormod.h"
+#include "color_helpers.h"
+#include "common.h"
+#include "dynamic_filters.h"
+#include "file.h"
+#include "filter.h"
+#include "font.h"
+#include "grad.h"
+#include "image.h"
+#include "rgbadraw.h"
+#include "rotate.h"
+#include "scale.h"
+#include "script.h"
 #include "span.h"
+#include "updates.h"
 #ifdef BUILD_X11
-#include "context.h"
 #include "color.h"
+#include "context.h"
+#include "draw.h"
 #include "grab.h"
 #include "rend.h"
 #include "rgba.h"
 #include "ximage.h"
-#include "draw.h"
 #endif
-#include "file.h"
-#include "updates.h"
-#include "rgbadraw.h"
-#include "Imlib2.h"
-#include <ft2build.h>
-#include FT_FREETYPE_H
-/*#ifdef HAVE_FREETYPE1_FREETYPE_FREETYPE_H
-#include <freetype1/freetype/freetype.h>
-#elif defined(HAVE_FREETYPE_FREETYPE_H)
-#include <freetype/freetype.h>
-#else
-#include <freetype.h>
-#endif
-*/
-#include "font.h"
-#include "grad.h"
-#include "rotate.h"
-#include "filter.h"
-#include "dynamic_filters.h"
-#include "script.h"
-#include <math.h>
-#include "color_helpers.h"
 
 /* convenience macros */
 #define   CAST_IMAGE(im, image) (im) = (ImlibImage *)(image)

src/lib/blend.c

@@ -1,7 +1,8 @@
 #include "common.h"
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "blend.h"
 #include "scale.h"
 
 #define ADD_COPY(r, g, b, dest) \

src/lib/blend.h

@@ -1,6 +1,8 @@
 #ifndef __BLEND
 #define __BLEND 1
 
+#include "colormod.h"
+
 #ifndef WORDS_BIGENDIAN
 
 #define A_VAL(p) ((DATA8 *)(p))[3]

src/lib/color.h

@@ -1,6 +1,8 @@
 #ifndef __COLOR
 #define __COLOR 1
 
+#include "common.h"
+
 #ifdef BUILD_X11
 
 extern DATA16       _max_colors;

src/lib/color_helpers.h

@@ -1,12 +1,6 @@
 #ifndef __COLOR_HELPERS 
 #define __COLOR_HELPERS 1
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <math.h>
-
 #include "common.h"
 
 __hidden void        __imlib_rgb_to_hsv(int r, int g, int b, float *hue, float *saturation, float *value);

src/lib/colormod.c

@@ -1,10 +1,10 @@
 #include "common.h"
-#include "colormod.h"
-#include "file.h"
-#include "loaderpath.h"
+
 #include <math.h>
-#include "image.h"
+
 #include "blend.h"
+#include "colormod.h"
+#include "image.h"
 
 static DATABIG      mod_count = 0;
 

src/lib/colormod.h

@@ -2,13 +2,6 @@
 #define __COLORMOD 1
 
 #include "common.h"
-#include <time.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <errno.h>
 #include "image.h"
 
 typedef struct _imlib_color_modifier    ImlibColorModifier;

src/lib/context.c

@@ -1,9 +1,9 @@
 #include "common.h"
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
-#include "image.h"
-#include "context.h"
 #include "color.h"
+#include "context.h"
+#include "image.h"
 #include "rgba.h"
 
 static Context     *context = NULL;

src/lib/context.h

@@ -1,6 +1,8 @@
 #ifndef __CONTEXT
 #define __CONTEXT 1
 
+#include "common.h"
+
 typedef struct _context Context;
 
 struct _context {

src/lib/draw.c

@@ -2,11 +2,12 @@
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
-#include "colormod.h"
-#include "image.h"
+
 #include "blend.h"
-#include "rend.h"
+#include "colormod.h"
 #include "draw.h"
+#include "image.h"
+#include "rend.h"
 
 char
 __imlib_CreatePixmapsForImage(Display * d, Drawable w, Visual * v, int depth,

src/lib/draw.h

@@ -1,6 +1,9 @@
 #ifndef __DRAW
 #define __DRAW 1
 
+#include "colormod.h"
+#include "common.h"
+
 __hidden char       __imlib_CreatePixmapsForImage(Display * d, Drawable w,
                                                   Visual * v, int depth,
                                                   Colormap cm, ImlibImage * im,

src/lib/dynamic_filters.c

@@ -1,20 +1,22 @@
 #include "common.h"
+
+#include <ctype.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 #include <time.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <errno.h>
-#include "image.h"
-#include "file.h"
+#include <sys/types.h>
+
 #include "dynamic_filters.h"
-#include "script.h"
+#include "file.h"
+#include "image.h"
 #include "loaderpath.h"
+#include "script.h"
 
 static pImlibExternalFilter filters = NULL;
 static int          dyn_initialised = 0;

src/lib/dynamic_filters.h

@@ -1,6 +1,7 @@
 #ifndef _DYNAMIC_FILTERS_H_
 #define _DYNAMIC_FILTERS_H_
 
+#include "common.h"
 #include "script.h"
 
 struct imlib_filter_info

src/lib/ellipse.c

@@ -1,10 +1,10 @@
 #include "common.h"
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "blend.h"
-#include "span.h"
-#include "updates.h"
 #include "rgbadraw.h"
+#include "span.h"
 
 static void
 __imlib_Ellipse_DrawToData(int xc, int yc, int a, int b, DATA32 color,

src/lib/file.c

@@ -1,13 +1,15 @@
 #include "common.h"
-#include <stdio.h>
+
 #include <ctype.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <dirent.h>
-#include <string.h>
-#include <stdlib.h>
 #include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include "file.h"
 
 char               *

src/lib/file.h

@@ -1,6 +1,8 @@
 #ifndef __FILE
 #define __FILE 1
 
+#include "common.h"
+
 __hidden char               *__imlib_FileKey(const char *file);
 __hidden char               *__imlib_FileRealFile(const char *file);
 __hidden char               *__imlib_FileExtension(const char *file);

src/lib/filter.c

@@ -1,8 +1,9 @@
 #include "common.h"
-#include "colormod.h"
-#include "image.h"
+
 #include "blend.h"
+#include "colormod.h"
 #include "filter.h"
+#include "image.h"
 
 /*\ Create and return an empty filter struct \*/
 ImlibFilter        *

src/lib/filter.h

@@ -1,6 +1,8 @@
 #ifndef __FILTER
 #define __FILTER 1
 
+#include "common.h"
+
 typedef struct _imlib_filter ImlibFilter;
 typedef struct _imlib_filter_color ImlibFilterColor;
 typedef struct _imlib_filter_pixel ImlibFilterPixel;
@@ -39,4 +41,5 @@ __hidden void
 __imlib_FilterConstants(ImlibFilter *fil, int a, int r, int g, int b);
 __hidden void
 __imlib_FilterImage(ImlibImage *im, ImlibFilter *fil);
+
 #endif

src/lib/font.h

@@ -2,6 +2,8 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
+#include "common.h"
+
 /* TODO separate fonts and data stuff */
 
 typedef struct _Imlib_Font 		ImlibFont;

src/lib/font_draw.c

@@ -1,17 +1,17 @@
 #include "config.h"
-#include "common.h"
-#include "colormod.h"
-#include "image.h"
-#include "blend.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
-#include "font.h"
-#include <sys/types.h>
-#include <string.h>
 #include <math.h>
-#include "file.h"
-#include "updates.h"
+#include <string.h>
+#include <sys/types.h>
+
+#include "blend.h"
+#include "colormod.h"
+#include "common.h"
+#include "font.h"
+#include "image.h"
 #include "rgbadraw.h"
 #include "rotate.h"
 

src/lib/font_load.c

@@ -1,17 +1,18 @@
 #include "config.h"
-#include "common.h"
-#include "colormod.h"
-#include "image.h"
-#include "blend.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
-#include "font.h"
-#include <sys/types.h>
-#include <string.h>
 #include <math.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "blend.h"
+#include "colormod.h"
+#include "common.h"
 #include "file.h"
-#include "updates.h"
+#include "font.h"
+#include "image.h"
 #include "rgbadraw.h"
 #include "rotate.h"
 

src/lib/font_main.c

@@ -1,17 +1,17 @@
 #include "config.h"
-#include "common.h"
-#include "colormod.h"
-#include "image.h"
-#include "blend.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
-#include "font.h"
-#include <sys/types.h>
-#include <string.h>
 #include <math.h>
-#include "file.h"
-#include "updates.h"
+#include <string.h>
+#include <sys/types.h>
+
+#include "blend.h"
+#include "colormod.h"
+#include "common.h"
+#include "font.h"
+#include "image.h"
 #include "rgbadraw.h"
 #include "rotate.h"
 

src/lib/font_query.c

@@ -1,17 +1,17 @@
 #include "config.h"
-#include "common.h"
-#include "colormod.h"
-#include "image.h"
-#include "blend.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
-#include "font.h"
-#include <sys/types.h>
-#include <string.h>
 #include <math.h>
-#include "file.h"
-#include "updates.h"
+#include <string.h>
+#include <sys/types.h>
+
+#include "blend.h"
+#include "colormod.h"
+#include "common.h"
+#include "image.h"
+#include "font.h"
 #include "rgbadraw.h"
 #include "rotate.h"
 

src/lib/grab.c

@@ -1,11 +1,12 @@
 #include "common.h"
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
+#include <X11/extensions/XShm.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
+
 #include "grab.h"
 #include "ximage.h"
 

src/lib/grab.h

@@ -1,6 +1,8 @@
 #ifndef __GRAB
 #define __GRAB 1
 
+#include "common.h"
+
 __hidden char       __imlib_GrabDrawableToRGBA(DATA32 * data, int ox, int oy,
                                                int ow, int oh, Display * d,
                                                Drawable p, Pixmap m, Visual * v,

src/lib/grad.c

@@ -1,12 +1,12 @@
 #include "common.h"
-#include "colormod.h"
-#include "file.h"
-#include "loaderpath.h"
+
 #include <math.h>
-#include "image.h"
+
 #include "blend.h"
-#include "grad.h"
+#include "colormod.h"
 #include "color_helpers.h"
+#include "grad.h"
+#include "image.h"
 
 ImlibRange         *
 __imlib_CreateRange(void)

src/lib/grad.h

@@ -1,6 +1,8 @@
 #ifndef __GRAD
 #define __GRAD 1
 
+#include "common.h"
+
 typedef struct _imlib_range       ImlibRange;
 typedef struct _imlib_range_color ImlibRangeColor;
 

src/lib/image.c

@@ -1,18 +1,20 @@
 #include "common.h"
-#include <time.h>
+
+#include <ctype.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <string.h>
+#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <errno.h>
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
 #endif
-#include "image.h"
+
 #include "file.h"
+#include "image.h"
 #include "loaderpath.h"
-#include "Imlib2.h"
 
 static ImlibImage  *images = NULL;
 

src/lib/image.h

@@ -1,25 +1,19 @@
 #ifndef __IMAGE
-# define __IMAGE 1
+#define __IMAGE 1
 
-# include "common.h"
-# ifdef BUILD_X11
-#  include <X11/Xlib.h>
-# else
-#  define X_DISPLAY_MISSING
-# endif
+#include "common.h"
+#ifdef BUILD_X11
+#include <X11/Xlib.h>
+#else
+#define X_DISPLAY_MISSING
+#endif
 
-# include <dlfcn.h>
-# include <Imlib2.h>
-
-# ifndef RTLD_LOCAL
-#  define RTLD_LOCAL 0
-#  warning "your crap box doesn't define RTLD_LOCAL !?"
-# endif
+#include <Imlib2.h>
 
 typedef struct _imlibimage              ImlibImage;
-# ifdef BUILD_X11
+#ifdef BUILD_X11
 typedef struct _imlibimagepixmap        ImlibImagePixmap;
-# endif
+#endif
 typedef struct _imlibborder             ImlibBorder;
 typedef struct _imlibloader             ImlibLoader;
 typedef struct _imlibimagetag           ImlibImageTag;
@@ -76,7 +70,7 @@ struct _imlibimage
    char             *key;
 };
 
-# ifdef BUILD_X11
+#ifdef BUILD_X11
 struct _imlibimagepixmap
 {
    int               w, h;
@@ -95,7 +89,7 @@ struct _imlibimagepixmap
    DATABIG           modification_count;
    ImlibImagePixmap *next;
 };
-# endif
+#endif
 
 struct _imlibloader
 {
@@ -129,7 +123,7 @@ __hidden void              __imlib_AddImageToCache(ImlibImage *im);
 __hidden void              __imlib_RemoveImageFromCache(ImlibImage *im);
 __hidden int               __imlib_CurrentCacheSize(void);
 __hidden void              __imlib_CleanupImageCache(void);
-# ifdef BUILD_X11
+#ifdef BUILD_X11
 __hidden ImlibImagePixmap *__imlib_ProduceImagePixmap(void);
 __hidden void              __imlib_ConsumeImagePixmap(ImlibImagePixmap *ip);
 __hidden ImlibImagePixmap *__imlib_FindCachedImagePixmap(ImlibImage *im, int w, int h, 
@@ -142,7 +136,7 @@ __hidden ImlibImagePixmap *__imlib_FindCachedImagePixmapByID(Display *d, Pixmap
 __hidden void              __imlib_AddImagePixmapToCache(ImlibImagePixmap *ip);
 __hidden void              __imlib_RemoveImagePixmapFromCache(ImlibImagePixmap *ip);
 __hidden void              __imlib_CleanupImagePixmapCache(void);
-# endif
+#endif
 __hidden ImlibLoader      *__imlib_ProduceLoader(char *file);
 __hidden char            **__imlib_ListLoaders(int *num_ret);
 __hidden char            **__imlib_TrimLoaderList(char **list, int *num);
@@ -159,36 +153,36 @@ __hidden ImlibImage       *__imlib_LoadImage(const char *file,
 				    ImlibProgressFunction progress,
 				    char progress_granularity, char immediate_load,
 				    char dont_cache, ImlibLoadError *er);
-# ifdef BUILD_X11
+#ifdef BUILD_X11
 __hidden ImlibImagePixmap *__imlib_FindImlibImagePixmapByID(Display *d, Pixmap p);
-# endif
+#endif
 __hidden void              __imlib_FreeImage(ImlibImage *im);
-# ifdef BUILD_X11
+#ifdef BUILD_X11
 __hidden void              __imlib_FreePixmap(Display *d, Pixmap p);
-# endif
+#endif
 __hidden void              __imlib_FlushCache(void);
-# ifdef BUILD_X11
+#ifdef BUILD_X11
 __hidden void              __imlib_DirtyPixmapsForImage(ImlibImage *im);
-# else
-#  define	__imlib_DirtyPixmapsForImage(x)	/* x */
-# endif
+#else
+#define	__imlib_DirtyPixmapsForImage(x)	/* x */
+#endif
 __hidden void              __imlib_DirtyImage(ImlibImage *im);
 __hidden void              __imlib_SaveImage(ImlibImage *im, const char *file,
 				    ImlibProgressFunction progress,
 		                    char progress_granularity,
 		                    ImlibLoadError *er);
 
-# define IMAGE_HAS_ALPHA(im) ((im)->flags & F_HAS_ALPHA)
-# define IMAGE_IS_UNLOADED(im) ((im)->flags & F_UNLOADED)
-# define IMAGE_IS_UNCACHEABLE(im) ((im)->flags & F_UNCACHEABLE)
-# define IMAGE_ALWAYS_CHECK_DISK(im) ((im)->flags & F_ALWAYS_CHECK_DISK)
-# define IMAGE_IS_VALID(im) (!((im)->flags & F_INVALID))
-# define IMAGE_FREE_DATA(im) (!((im)->flags & F_DONT_FREE_DATA))
+#define IMAGE_HAS_ALPHA(im) ((im)->flags & F_HAS_ALPHA)
+#define IMAGE_IS_UNLOADED(im) ((im)->flags & F_UNLOADED)
+#define IMAGE_IS_UNCACHEABLE(im) ((im)->flags & F_UNCACHEABLE)
+#define IMAGE_ALWAYS_CHECK_DISK(im) ((im)->flags & F_ALWAYS_CHECK_DISK)
+#define IMAGE_IS_VALID(im) (!((im)->flags & F_INVALID))
+#define IMAGE_FREE_DATA(im) (!((im)->flags & F_DONT_FREE_DATA))
 
-# define SET_FLAG(flags, f) ((flags) |= (f))
-# define UNSET_FLAG(flags, f) ((flags) &= (~f))
+#define SET_FLAG(flags, f) ((flags) |= (f))
+#define UNSET_FLAG(flags, f) ((flags) &= (~f))
 
-# define IMAGE_DIMENSIONS_OK(w, h) \
+#define IMAGE_DIMENSIONS_OK(w, h) \
    ( ((w) > 0) && ((h) > 0) && \
      ((unsigned long long)(w) * (unsigned long long)(h) <= (1ULL << 29) - 1) )
 

src/lib/line.c

@@ -1,10 +1,11 @@
 #include "common.h"
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "blend.h"
+#include "rgbadraw.h"
 #include "span.h"
 #include "updates.h"
-#include "rgbadraw.h"
 
 #define EXCHANGE_POINTS(x0, y0, x1, y1)  \
 do {                                     \

src/lib/polygon.c

@@ -1,10 +1,10 @@
 #include "common.h"
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "blend.h"
-#include "span.h"
-#include "updates.h"
 #include "rgbadraw.h"
+#include "span.h"
 
 ImlibPoly
 __imlib_polygon_new()

src/lib/rectangle.c

@@ -1,10 +1,10 @@
 #include "common.h"
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "blend.h"
-#include "span.h"
-#include "updates.h"
 #include "rgbadraw.h"
+#include "span.h"
 
 static void
 __imlib_Rectangle_DrawToData(int x, int y, int rw, int rh, DATA32 color,

src/lib/rend.c

@@ -3,17 +3,18 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
+
+#include "blend.h"
+#include "color.h"
 #include "colormod.h"
+#include "context.h"
+#include "grab.h"
 #include "image.h"
+#include "rend.h"
+#include "rgba.h"
+#include "rotate.h"
 #include "scale.h"
 #include "ximage.h"
-#include "context.h"
-#include "rgba.h"
-#include "color.h"
-#include "grab.h"
-#include "blend.h"
-#include "rend.h"
-#include "rotate.h"
 
 /* The maximum pixmap dimension is 65535. */
 /* However, for now, use 46340 (46340^2 < 2^31) to avoid buffer overflow issues. */

src/lib/rend.h

@@ -1,6 +1,8 @@
 #ifndef __REND
 #define __REND 1
 
+#include "common.h"
+
 __hidden DATA32     __imlib_RenderGetPixel(Display * d, Drawable w, Visual * v,
                                            Colormap cm, int depth, DATA8 r,
                                            DATA8 g, DATA8 b);

src/lib/rgba.c

@@ -1,6 +1,7 @@
 #include "common.h"
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
+
 #include "context.h"
 #include "rgba.h"
 

src/lib/rgba.h

@@ -1,6 +1,8 @@
 #ifndef __RGBA
 #define __RGBA 1
 
+#include "common.h"
+
 #define DM_BS1 (8 + 3)
 #define DM_BS2 (8)
 #define DM_X (8)

src/lib/rgbadraw.c

@@ -1,11 +1,13 @@
 #include "common.h"
+
 #include <math.h>
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "scale.h"
-#include "blend.h"
-#include "updates.h"
 #include "rgbadraw.h"
+#include "scale.h"
+#include "updates.h"
 
 void
 __imlib_FlipImageHoriz(ImlibImage * im)

src/lib/rgbadraw.h

@@ -1,6 +1,9 @@
 #ifndef __RGBADRAW
 #define __RGBADRAW 1
 
+#include "common.h"
+#include "updates.h"
+
 #define IN_SEGMENT(x, sx, sw) \
 ((unsigned)((x) - (sx)) < (unsigned)(sw))
 

src/lib/rotate.c

@@ -1,6 +1,7 @@
 #include "common.h"
-#include "rotate.h"
+
 #include "blend.h"
+#include "rotate.h"
 
 /*\ Linear interpolation functions \*/
 /*\ Between two values \*/

src/lib/rotate.h

@@ -1,6 +1,7 @@
 #ifndef __ROTATE
 #define __ROTATE 1
 
+#include "common.h"
 #include "image.h"
 #include "colormod.h"
 #include "blend.h"

src/lib/scale.c

@@ -1,11 +1,12 @@
 #include "common.h"
-#include "colormod.h"
-#include "image.h"
-#include "blend.h"
-#include "scale.h"
 
 #include <assert.h>
 
+#include "blend.h"
+#include "colormod.h"
+#include "image.h"
+#include "scale.h"
+
 /*\ NB: If you change this, don't forget asm_scale.S \*/
 struct _imlib_scale_info {
    int                *xpoints;

src/lib/scale.h

@@ -1,6 +1,8 @@
 #ifndef __SCALE
 #define __SCALE 1
 
+#include "common.h"
+
 typedef struct _imlib_scale_info ImlibScaleInfo;
 
 __hidden ImlibScaleInfo *

src/lib/script.c

@@ -1,25 +1,24 @@
 #include "common.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <time.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+
 #include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
 #else
 #define X_DISPLAY_MISSING
 #endif
-#include "image.h"
-#include "file.h"
+
 #include "dynamic_filters.h"
+#include "image.h"
 #include "script.h"
-#include "loaderpath.h"
 
 /*
 #define FDEBUG 1

src/lib/script.h

@@ -1,15 +1,15 @@
 #ifndef _DYN_FUNCTION_H_
 #define _DYN_FUNCTION_H_
 
-#include <dlfcn.h>
+#include <stdarg.h>
+#include "common.h"
+#include "image.h"
 
 #ifndef BUILD_X11
-# ifndef X_DISPLAY_MISSING
-#  define X_DISPLAY_MISSING
-# endif
+#ifndef X_DISPLAY_MISSING
+#define X_DISPLAY_MISSING
+#endif
 #endif
-#include "Imlib2.h"
-#include <stdarg.h>
 
 #define VAR_CHAR 1
 #define VAR_PTR  2

src/lib/span.c

@@ -1,7 +1,8 @@
 #include "common.h"
+
+#include "blend.h"
 #include "colormod.h"
 #include "image.h"
-#include "blend.h"
 #include "span.h"
 
 #define ADD_COPY(r, g, b, dest) \

src/lib/span.h

@@ -1,6 +1,7 @@
 #ifndef __SPAN
 #define __SPAN 1
 
+#include "common.h"
 
 typedef void (*ImlibPointDrawFunction)(DATA32, DATA32 *);
 
@@ -19,6 +20,4 @@ typedef void (*ImlibShapedSpanDrawFunction)(DATA8 *, DATA32, DATA32 *, int);
 __hidden ImlibShapedSpanDrawFunction
 __imlib_GetShapedSpanDrawFunction(ImlibOp op, char dst_alpha, char blend);
 
-
 #endif
-

src/lib/updates.c

@@ -1,4 +1,5 @@
 #include "common.h"
+
 #include "updates.h"
 
 enum _t_used {

src/lib/updates.h

@@ -1,5 +1,8 @@
 #ifndef __UPDATES
 #define __UPDATES 1
+
+#include "common.h"
+
 typedef struct _imlibupdate ImlibUpdate;
 
 struct _imlibupdate

src/lib/ximage.c

@@ -5,6 +5,7 @@
 #include <X11/Xutil.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
+
 #include "ximage.h"
 
 /* global flags */

src/lib/ximage.h

@@ -4,6 +4,8 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
 
+#include "common.h"
+
 __hidden extern signed char x_does_shm;
 
 void                __imlib_SetMaxXImageCount(Display * d, int num);

src/modules/loaders/loader_tga.c

@@ -10,9 +10,9 @@
  * header/footer structures courtesy of the GIMP Targa plugin 
  */
 #include "loader_common.h"
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include "colormod.h"
 #include "blend.h"
 
 /* flip an inverted image - see RLE reading below */