Deal consistently with including Imlib2.h

- Always include config.h before Imlib2.h
  Needed for X_DISPLAY_MISSING.
- Always include config.h and Imlib2.h first
  Should make it more likely to spot stuff missing but required
  in Imlib2.h, like stddef.h.
  gtest.h apparently must be included before X headers though.
- Make sure we use the Imlib2.h here and not the one in /usr/include

Also ensure that the tests build when building without X.

src/bin/imlib2_bumpmap.c

@@ -1,12 +1,11 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <Imlib2.h>
-
 Display            *disp;
 Window              win;
 

src/bin/imlib2_colorspace.c

@@ -1,12 +1,11 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <Imlib2.h>
-
 Display            *disp;
 Window              win;
 

src/bin/imlib2_conv.c

@@ -1,18 +1,18 @@
-#include "config.h"
+/*
-/* Convert images between formats, using Imlib2's API. Smart enough to know
+ * Convert images between formats, using Imlib2's API.
- * about edb files; defaults to jpg's.
+ * Defaults to jpg's.
  */
+#include "config.h"
+#ifndef X_DISPLAY_MISSING
+#define X_DISPLAY_MISSING
+#endif
+#include <Imlib2.h>
 
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#ifndef X_DISPLAY_MISSING
-#define X_DISPLAY_MISSING
-#endif
-#include <Imlib2.h>
-
 #define PROG_NAME "imlib2_conv"
 
 static void         usage(int exit_status);

src/bin/imlib2_grab.c

@@ -1,12 +1,11 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <Imlib2.h>
-
 Display            *disp;
 int                 image_width = 0, image_height = 0;
 

src/bin/imlib2_load.c

@@ -1,4 +1,9 @@
 #include "config.h"
+#ifndef X_DISPLAY_MISSING
+#define X_DISPLAY_MISSING
+#endif
+#include <Imlib2.h>
+
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -11,11 +16,6 @@
 #include <sys/time.h>
 #endif
 
-#ifndef X_DISPLAY_MISSING
-#define X_DISPLAY_MISSING
-#endif
-#include <Imlib2.h>
-
 #define PROG_NAME "imlib2_load"
 
 static char         progress_called;

src/bin/imlib2_poly.c

@@ -1,12 +1,11 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <Imlib2.h>
-
 Display            *disp;
 Window              win;
 

src/bin/imlib2_show.c

@@ -1,4 +1,5 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
@@ -10,8 +11,6 @@
 #include <math.h>
 #include <locale.h>
 
-#include <Imlib2.h>
-
 Display            *disp;
 Window              win;
 

src/bin/imlib2_test.c

@@ -1,12 +1,11 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <Imlib2.h>
-
 /* some globals for our window & X display */
 Display            *disp;
 Window              win;

src/bin/imlib2_view.c

@@ -1,4 +1,5 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
@@ -8,7 +9,6 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include <Imlib2.h>
 #include "props.h"
 
 #define MIN(a, b) ((a < b) ? a : b)

src/lib/Imlib2.h.in

@@ -35,6 +35,7 @@
 #define IMLIB2_DEPRECATED
 #endif
 
+#include <stddef.h>
 #ifndef X_DISPLAY_MISSING
 #include <X11/Xlib.h>
 #endif

src/lib/api.c

@@ -1,10 +1,10 @@
 #include "config.h"
+#include <Imlib2.h>
 
 #include <math.h>
 #include <string.h>
 #include <stdarg.h>
 
-#include "Imlib2.h"
 #include "blend.h"
 #include "colormod.h"
 #include "color_helpers.h"

src/lib/api_obsolete.c

@@ -1,9 +1,8 @@
 /*
  * Obsolete, useless code
  */
-#include <stddef.h>
 #include "config.h"
-#include "Imlib2.h"
+#include <Imlib2.h>
 
 EAPI void
 imlib_image_set_irrelevant_border(char irrelevant)

src/lib/image.c

@@ -1,4 +1,5 @@
-#include "common.h"
+#include "config.h"
+#include <Imlib2.h>
 
 #include <ctype.h>
 #include <errno.h>
@@ -8,7 +9,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "Imlib2.h"
+#include "common.h"
 #include "debug.h"
 #include "file.h"
 #include "image.h"

src/lib/script.c

@@ -1,4 +1,5 @@
-#include "common.h"
+#include "config.h"
+#include <Imlib2.h>
 
 #include <ctype.h>
 #include <errno.h>
@@ -11,7 +12,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "Imlib2.h"
+#include "common.h"
 #include "dynamic_filters.h"
 #include "image.h"
 #include "script.h"

src/modules/filters/Makefile.am

@@ -1,5 +1,5 @@
 AM_CFLAGS            = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
-AM_CPPFLAGS          = -I$(top_builddir) -I$(top_srcdir)/src/lib
+AM_CPPFLAGS          = -I$(top_builddir) -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 
 pkgdir                = $(libdir)/imlib2/filters
 pkg_LTLIBRARIES       = testfilter.la bumpmap.la colormod.la

src/modules/filters/filter_bumpmap.c

@@ -1,7 +1,10 @@
-#include "filter_common.h"
+#include "config.h"
+#include <Imlib2.h>
+
 #include <string.h>
 #include <math.h>
-#include <Imlib2.h>
+
+#include "filter_common.h"
 #include "colormod.h"
 #include "blend.h"
 

src/modules/filters/filter_colormod.c

@@ -1,7 +1,10 @@
-#include "filter_common.h"
+#include "config.h"
+#include <Imlib2.h>
+
 #include <string.h>
 #include <math.h>
-#include <Imlib2.h>
+
+#include "filter_common.h"
 
 #define GET_INT(x, ptr) (((ptr)->type == VAR_PTR) ?	\
 			(x) = (*(int *)(ptr)->data) :	\

src/modules/filters/filter_test.c

@@ -1,7 +1,10 @@
-#include "filter_common.h"
+#include "config.h"
-#include <string.h>
 #include <Imlib2.h>
 
+#include <string.h>
+
+#include "filter_common.h"
+
 void
 init(ImlibFilterInfo * info)
 {

test/Makefile.am

@@ -11,9 +11,11 @@ CLEANFILES = file.c img_save-*.*
  GTESTS += test_load
  GTESTS += test_load_2
  GTESTS += test_save
- GTESTS += test_grab
  GTESTS += test_scale
  GTESTS += test_rotate
+if BUILD_X11
+ GTESTS += test_grab
+endif
 
  AM_CFLAGS  = -Wall -Wextra -Werror -Wno-unused-parameter
  AM_CFLAGS += $(CFLAGS_ASAN)

test/test_context.cpp

@@ -1,8 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <stddef.h>
+#include "config.h"
 #include <Imlib2.h>
 
+#include <stddef.h>
+
 #include "test.h"
 
 #define NULC ((Imlib_Context*)0)

test/test_grab.cpp

@@ -1,9 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <X11/Xutil.h>
+#include "config.h"
 #include <Imlib2.h>
 
-#include "config.h"
+#include <X11/Xutil.h>
+
 #include "test.h"
 
 typedef struct {

test/test_load.cpp

@@ -1,9 +1,10 @@
 #include <gtest/gtest.h>
 
+#include "config.h"
 #include <Imlib2.h>
+
 #include <fcntl.h>
 
-#include "config.h"
 #include "test.h"
 
 #define EXPECT_OK(x)  EXPECT_FALSE(x)

test/test_load_2.cpp

@@ -1,10 +1,11 @@
 #include <gtest/gtest.h>
 
+#include "config.h"
 #include <Imlib2.h>
+
 #include <fcntl.h>
 #include <zlib.h>
 
-#include "config.h"
 #include "test.h"
 
 #define EXPECT_OK(x)  EXPECT_FALSE(x)

test/test_rotate.cpp

@@ -1,9 +1,10 @@
 #include <gtest/gtest.h>
 
+#include "config.h"
 #include <Imlib2.h>
+
 #include <zlib.h>
 
-#include "config.h"
 #include "test.h"
 
 #define FILE_REF1	"icon-64"       // RGB

test/test_save.cpp

@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
+#include "config.h"
 #include <Imlib2.h>
 
-#include "config.h"
 #include "test.h"
 
 #define EXPECT_OK(x)  EXPECT_FALSE(x)

test/test_scale.cpp

@@ -1,9 +1,10 @@
 #include <gtest/gtest.h>
 
+#include "config.h"
 #include <Imlib2.h>
+
 #include <zlib.h>
 
-#include "config.h"
 #include "test.h"
 
 #define FILE_REF1	"icon-64"       // RGB