Clean up header file inclusion order.

Fixes building with e.g. -std=c99 and c11 by always including config.h (which defines _GNU_SOURCE) first.
2015-01-16 07:25:38 +01:00 · 2015-01-16 07:25:38 +01:00 · 9c31fe29ed
parent e5b71f40f3
commit 9c31fe29ed
66 changed files with 392 additions and 179 deletions
--- a/src/aclass.c
+++ b/src/aclass.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <ctype.h>
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "conf.h"
@ -31,7 +36,6 @@
 #include "grabs.h"
 #include "list.h"
 #include "timers.h"
-#include <ctype.h>

 typedef struct _actiontype {
   char               *params;
--- a/src/alert.c
+++ b/src/alert.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,8 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/src/animation.c
+++ b/src/animation.c
@ -21,12 +21,15 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <math.h>
+
 #include "E.h"
 #include "animation.h"
 #include "eobj.h"
 #include "timers.h"
 #include "util.h"
-#include <math.h>

 #define ENABLE_DEBUG   1
 #if ENABLE_DEBUG
--- a/src/backgrounds.c
+++ b/src/backgrounds.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,7 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <time.h>
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "backgrounds.h"
 #include "desktops.h"
--- a/src/borders.c
+++ b/src/borders.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,8 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "borders.h"
--- a/src/buttons.c
+++ b/src/buttons.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "buttons.h"
--- a/src/comms.c
+++ b/src/comms.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "comms.h"
 #include "hints.h"
--- a/src/container.c
+++ b/src/container.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "container.h"
 #include "dialog.h"
--- a/src/cursors.c
+++ b/src/cursors.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,17 +21,21 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#include <X11/cursorfont.h>
+#if USE_COMPOSITE
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/Xrender.h>
+#endif
+
 #include "E.h"
 #include "conf.h"
 #include "cursors.h"
 #include "emodule.h"
 #include "list.h"
 #include "xwin.h"
-#include <X11/cursorfont.h>
-#if USE_COMPOSITE
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/Xrender.h>
-#endif

 struct _ecursor {
   dlist_t             list;
--- a/src/desktops.c
+++ b/src/desktops.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,14 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <time.h>
+#include <X11/Xlib.h>
+#if USE_XRANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+
 #include "E.h"
 #include "aclass.h"
 #include "animation.h"
@ -43,10 +51,6 @@
 #include "timers.h"
 #include "tooltips.h"
 #include "xwin.h"
-#include <time.h>
-#if USE_XRANDR
-#include <X11/extensions/Xrandr.h>
-#endif

 #define DESK_EVENT_MASK1 \
  (ButtonPressMask | ButtonReleaseMask)
--- a/src/dialog.c
+++ b/src/dialog.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -23,6 +23,7 @@
 */
 #include "E.h"
 #if ENABLE_DIALOGS
+#include <X11/Xlib.h>
 #include "dialog.h"
 #include "eimage.h"
 #include "ewins.h"
--- a/src/dock.c
+++ b/src/dock.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2008 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "ewins.h"
 #include "iclass.h"
--- a/src/draw.c
+++ b/src/draw.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2007-2014 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "desktops.h"
 #include "eobj.h"
--- a/src/ecompmgr.c
+++ b/src/ecompmgr.c
@ -26,22 +26,9 @@
 * It has been mostly rewritten since, only the shadow code is more or less
 * intact.
 */
+#include "config.h"

-#include "E.h"
 #if USE_COMPOSITE
-#include "animation.h"
-#include "desktops.h"
-#include "ecompmgr.h"
-#include "emodule.h"
-#include "eobj.h"
-#include "events.h"
-#include "ewins.h"		/* EwinsManage() */
-#include "hints.h"
-#include "timers.h"
-#include "util.h"
-#include "windowmatch.h"
-#include "xwin.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@ -58,6 +45,19 @@
 #include <X11/extensions/Xpresent.h>
 #endif

+#include "E.h"
+#include "animation.h"
+#include "desktops.h"
+#include "ecompmgr.h"
+#include "emodule.h"
+#include "eobj.h"
+#include "events.h"
+#include "ewins.h"		/* EwinsManage() */
+#include "hints.h"
+#include "timers.h"
+#include "windowmatch.h"
+#include "xwin.h"
+
 #define ENABLE_SHADOWS      1

 #define USE_DESK_EXPOSE     0
--- a/src/econfig.c
+++ b/src/econfig.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,10 +20,13 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <ctype.h>
+
 #include "E.h"
 #include "econfig.h"
 #include "emodule.h"
-#include <ctype.h>

 /*
 * Braindead flat ASCII config file implementation
--- a/src/edbus.c
+++ b/src/edbus.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,12 +20,15 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <dbus/dbus.h>
+
 #include "E.h"
 #include "edbus.h"
 #include "events.h"
 #include "ipc.h"
 #include "xwin.h"
-#include <dbus/dbus.h>

 #define ENABLE_INTROSPECTION 1

--- a/src/edge.c
+++ b/src/edge.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "desktops.h"
 #include "eobj.h"
--- a/src/eglx.c
+++ b/src/eglx.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2014 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,16 +20,21 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <stdlib.h>
 #define GLX_GLXEXT_PROTOTYPES 1
-#include "E.h"
-#include "eglx.h"
-#include "eimage.h"
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glx.h>
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xrender.h>

+#include "E.h"
+#include "eglx.h"
+#include "eimage.h"
+#include "xwin.h"
+
 #define ENABLE_DEBUG   1
 #if ENABLE_DEBUG
 #define Dprintf(fmt...)  do { if(EDebug(EDBUG_TYPE_GLX))Eprintf(fmt); } while(0)
--- a/src/eimage.c
+++ b/src/eimage.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,14 +20,18 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "eimage.h"
-#include "xwin.h"
+#include "config.h"
+
 #include <Imlib2.h>
+#include <X11/Xlib.h>
 #if USE_XRENDER
 #include <X11/extensions/Xrender.h>
 #endif

+#include "E.h"
+#include "eimage.h"
+#include "xwin.h"
+
 void
 EImageInit(void)
 {
--- a/src/eobj.c
+++ b/src/eobj.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +20,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "animation.h"
 #include "desktops.h"
--- a/src/events.c
+++ b/src/events.c
@ -21,15 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "aclass.h"
-#include "ecompmgr.h"
-#include "emodule.h"
-#include "events.h"
-#include "timers.h"
-#include "tooltips.h"
-#include "xwin.h"
+#include "config.h"
+
 #include <sys/time.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 #if USE_XSYNC
@ -61,6 +56,15 @@
 #endif
 #define USE_GENERIC defined(USE_XI2) || defined(USE_XPRESENT)

+#include "E.h"
+#include "aclass.h"
+#include "ecompmgr.h"
+#include "emodule.h"
+#include "events.h"
+#include "timers.h"
+#include "tooltips.h"
+#include "xwin.h"
+
 #if ENABLE_DEBUG_EVENTS
 static const char  *EventName(unsigned int type);
 #endif
--- a/src/ewin-ops.c
+++ b/src/ewin-ops.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "animation.h"
 #include "borders.h"
--- a/src/ewins.c
+++ b/src/ewins.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,12 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/shape.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "borders.h"
@ -40,8 +46,6 @@
 #include "snaps.h"
 #include "windowmatch.h"
 #include "xwin.h"
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>

 #define EWIN_TOP_EVENT_MASK \
  (EnterWindowMask | LeaveWindowMask)
--- a/src/ewmh.c
+++ b/src/ewmh.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 Kim Woelders
+ * Copyright (C) 2003-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -23,6 +23,10 @@
 /*
 * Extended Window Manager Hints.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "desktops.h"
 #include "events.h"
--- a/src/extinitwin.c
+++ b/src/extinitwin.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,10 +21,9 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "eimage.h"
-#include "xprop.h"
-#include "xwin.h"
+#include "config.h"
+
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 #define USE_EIWC_WINDOW 1
@ -33,6 +32,11 @@
 #include <X11/extensions/Xrender.h>
 #endif

+#include "E.h"
+#include "eimage.h"
+#include "xprop.h"
+#include "xwin.h"
+
 typedef struct {
   EX_Cursor           curs;
   XSetWindowAttributes attr;
--- a/src/file.c
+++ b/src/file.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2007-2013 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,9 +21,8 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "file.h"
-#include "util.h"
+#include "config.h"
+
 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>
@ -31,6 +30,10 @@
 #include <sys/types.h>
 #include <unistd.h>

+#include "E.h"
+#include "file.h"
+#include "util.h"
+
 char              **
 E_ls(const char *dir, int *num)
 {
--- a/src/finders.c
+++ b/src/finders.c
@ -21,12 +21,15 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <ctype.h>
+#include <string.h>
+
 #include "E.h"
 #include "ewins.h"
 #include "groups.h"
 #include "util.h"
-#include <ctype.h>
-#include <string.h>

 EWin               *
 EwinFindByPtr(const EWin * ewin)
--- a/src/focus.c
+++ b/src/focus.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "cursors.h"
 #include "desktops.h"		/* FIXME - Should not be here */
--- a/src/fx.c
+++ b/src/fx.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <math.h>
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "animation.h"
 #include "desktops.h"
@ -31,7 +36,6 @@
 #include "settings.h"
 #include "util.h"
 #include "xwin.h"
-#include <math.h>

 #define M_2PI_F ((float)(2 * M_PI))

--- a/src/glwin.c
+++ b/src/glwin.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2014 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +20,16 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <GL/glx.h>
+#include <X11/keysym.h>
+
 #include "E.h"
 #include "animation.h"
 #include "cursors.h"
@ -33,14 +43,6 @@
 #include "grabs.h"
 #include "util.h"

-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include <GL/glx.h>
-#include <X11/keysym.h>
-
 #define ENABLE_DEBUG   1
 #if ENABLE_DEBUG
 #define Dprintf(fmt...)  do { if(EDebug(EDBUG_TYPE_GLX))Eprintf(fmt); } while(0)
--- a/src/grabs.c
+++ b/src/grabs.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,16 +21,20 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "cursors.h"
-#include "grabs.h"
-#include "xwin.h"
+#include "config.h"
+
+#include <X11/Xlib.h>
 #if USE_XI2
 #include <X11/extensions/XInput2.h>
 #define DEV_PTR Mode.events.xi2_ptr
 #define DEV_KBD Mode.events.xi2_kbd
 #endif

+#include "E.h"
+#include "cursors.h"
+#include "grabs.h"
+#include "xwin.h"
+
 static int
 _GrabKeyboard(Win win, int sync_kbd)
 {
--- a/src/handlers.c
+++ b/src/handlers.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,11 +21,14 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "session.h"
+#include "config.h"
+
 #include <sys/wait.h>
 #include <signal.h>

+#include "E.h"
+#include "session.h"
+
 static void
 SignalHandler(int sig)
 {
--- a/src/hints.c
+++ b/src/hints.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 Kim Woelders
+ * Copyright (C) 2003-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -23,6 +23,11 @@
 /*
 * Feeble attempt to collect hint stuff in one place
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
 #include "E.h"
 #include "borders.h"		/* FIXME - Should not be here */
 #include "desktops.h"		/* FIXME - Should not be here */
@ -31,7 +36,6 @@
 #include "hints.h"
 #include "xprop.h"
 #include "xwin.h"
-#include <X11/Xatom.h>

 static void         EHintsSetDeskInfo(void);
 static void         EHintsSetAreaInfo(void);
--- a/src/hiwin.c
+++ b/src/hiwin.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "cursors.h"
 #include "eobj.h"
--- a/src/icccm.c
+++ b/src/icccm.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,14 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#if USE_XSYNC
+#include <X11/extensions/sync.h>
+#endif
+
 #include "E.h"
 #include "desktops.h"
 #include "ewins.h"
@ -28,10 +36,6 @@
 #include "session.h"
 #include "xprop.h"
 #include "xwin.h"
-#include <X11/Xutil.h>
-#if USE_XSYNC
-#include <X11/extensions/sync.h>
-#endif

 static void         ICCCM_SetIconSizes(void);

--- a/src/iclass.c
+++ b/src/iclass.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "backgrounds.h"
 #include "conf.h"
--- a/src/iconify.c
+++ b/src/iconify.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <math.h>
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "container.h"
 #include "desktops.h"
@ -32,7 +37,6 @@
 #include "timers.h"
 #include "tooltips.h"
 #include "xwin.h"
-#include <math.h>

 #define M_PI_F  ((float)(M_PI))
 #define M_2PI_F ((float)(2 * M_PI))
--- a/src/ipc.c
+++ b/src/ipc.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "borders.h"		/* FIXME - Should not be here */
--- a/src/lang.c
+++ b/src/lang.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2011 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,18 +21,19 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "emodule.h"
-#include "lang.h"
-#include <X11/Xlib.h>
+#include "config.h"

 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
-
 #if HAVE_LANGINFO_CODESET
 #include <langinfo.h>
 #endif
+#include <X11/Xlib.h>
+
+#include "E.h"
+#include "emodule.h"
+#include "lang.h"

 #ifndef ENABLE_NLS
 #define bindtextdomain(pkg,locale)
--- a/src/list.c
+++ b/src/list.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Kim Woelders
+ * Copyright (C) 2013-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,7 +20,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <stdlib.h>
+
 #include "list.h"

 #if LIST_NOINLINE_dlist_find
--- a/src/magwin.c
+++ b/src/magwin.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2014 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +20,14 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
 #include "E.h"
 #include "animation.h"
 #include "cursors.h"
@ -34,11 +42,6 @@
 #include "tclass.h"
 #include "util.h"

-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <X11/keysym.h>
-
 /* Magnifier window */
 typedef struct {
   EWin               *ewin;
--- a/src/main.c
+++ b/src/main.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,9 +21,13 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <sys/utsname.h>
 #include <signal.h>
 #include <time.h>
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "comms.h"
 #include "cursors.h"
--- a/src/memory.c
+++ b/src/memory.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2005-2013 Kim Woelders
+ * Copyright (C) 2005-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,9 +21,12 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "util.h"

 char               *
--- a/src/menus-misc.c
+++ b/src/menus-misc.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <errno.h>
+#include <sys/stat.h>
+
 #include "E.h"
 #include "backgrounds.h"
 #include "borders.h"
@ -32,8 +37,6 @@
 #include "menus.h"
 #include "parse.h"
 #include "progress.h"
-#include <errno.h>
-#include <sys/stat.h>

 static char         menu_scan_recursive = 0;

--- a/src/menus.c
+++ b/src/menus.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,12 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <time.h>
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
 #include "E.h"
 #include "animation.h"
 #include "borders.h"
@ -43,8 +49,6 @@
 #include "timers.h"
 #include "tooltips.h"
 #include "xwin.h"
-#include <time.h>
-#include <X11/keysym.h>

 #define DEBUG_MENU_EVENTS 0

--- a/src/misc.c
+++ b/src/misc.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,11 +21,14 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "eobj.h"
-#include "xwin.h"
-#include <sys/time.h>
+#include "config.h"
+
 #include <time.h>
+#include <sys/time.h>
+#include <X11/Xlib.h>
+
+#include "E.h"
+#include "xwin.h"

 /*
 * Debug/error message printing.
--- a/src/moveresize.c
+++ b/src/moveresize.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2012 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
 #include "E.h"
 #include "borders.h"
 #include "cursors.h"
@ -33,7 +38,6 @@
 #include "hints.h"
 #include "timers.h"
 #include "xwin.h"
-#include <X11/keysym.h>

 static struct {
   Win                 events;
--- a/src/pager.c
+++ b/src/pager.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,13 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#if USE_XRENDER
+#include <X11/extensions/Xrender.h>
+#endif
+
 #include "E.h"
 #include "backgrounds.h"
 #include "desktops.h"
@ -39,9 +46,6 @@
 #include "timers.h"
 #include "tooltips.h"
 #include "xwin.h"
-#if USE_XRENDER
-#include <X11/extensions/Xrender.h>
-#endif

 #define DEBUG_PAGER 0
 #if DEBUG_PAGER
--- a/src/parse.c
+++ b/src/parse.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,10 +20,13 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "parse.h"

 int
--- a/src/settings.c
+++ b/src/settings.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,8 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
+#include "config.h"
+
 #if ENABLE_DIALOGS
+#include "E.h"
 #include "dialog.h"
 #include "settings.h"

--- a/src/setup.c
+++ b/src/setup.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,8 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"

 #include <signal.h>
+#include <X11/Xlib.h>
 #include <X11/keysym.h>

 #include "E.h"
--- a/src/shapewin.c
+++ b/src/shapewin.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2014 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +20,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "ewins.h"
 #include "shapewin.h"
--- a/src/slideout.c
+++ b/src/slideout.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2013 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "borders.h"
--- a/src/string.c
+++ b/src/string.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Kim Woelders
+ * Copyright (C) 2008-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,9 +20,12 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "util.h"
+#include "config.h"
+
 #include <ctype.h>

+#include "util.h"
+
 #ifndef HAVE_STRCASECMP
 int
 Estrcasecmp(const char *s1, const char *s2)
--- a/src/systray.c
+++ b/src/systray.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +20,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "container.h"
 #include "events.h"
--- a/src/text.c
+++ b/src/text.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "eimage.h"
 #include "tclass.h"
--- a/src/text_pango.c
+++ b/src/text_pango.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2014 Kim Woelders
+ * Copyright (C) 2007-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,7 +20,7 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
+#include "config.h"

 #ifdef USE_PANGO
 #include <X11/Xft/Xft.h>
--- a/src/text_xft.c
+++ b/src/text_xft.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Kim Woelders
+ * Copyright (C) 2006-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,13 +20,13 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "tclass.h"
+#include "config.h"

 #ifdef USE_XFT
-#include "xwin.h"
 #include <X11/extensions/Xrender.h>
 #include <X11/Xft/Xft.h>
+#include "tclass.h"
+#include "xtypes.h"

 /*
 * Xft
--- a/src/time.c
+++ b/src/time.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Kim Woelders
+ * Copyright (C) 2011-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,11 +21,13 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "config.h"
+
 #if USE_MONOTONIC_CLOCK
 #include <time.h>
 #else
 #include <sys/time.h>
 #endif
+
 #include "util.h"

 unsigned int
--- a/src/tooltips.c
+++ b/src/tooltips.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,6 +21,10 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+
 #include "E.h"
 #include "aclass.h"
 #include "conf.h"
--- a/src/ttfont.c
+++ b/src/ttfont.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,10 +21,11 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
+#include "config.h"
 #include "tclass.h"

 #if FONT_TYPE_IFT
+#include "E.h"
 #include "eimage.h"
 #include <Imlib2.h>

--- a/src/user.c
+++ b/src/user.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2012 Kim Woelders
+ * Copyright (C) 2012-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,14 +21,17 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "file.h"
-#include "user.h"
-#include "util.h"
+#include "config.h"
+
 #include <pwd.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>

+#include "file.h"
+#include "user.h"
+#include "util.h"
+
 static int          usr_uid = -1;
 static const char  *usr_name = "unknown";
 static const char  *usr_home = "/tmp";
--- a/src/warp.c
+++ b/src/warp.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -31,6 +31,11 @@
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
+#include "config.h"
+
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
 #include "E.h"
 #include "desktops.h"
 #include "emodule.h"
@ -44,7 +49,6 @@
 #include "tclass.h"
 #include "tooltips.h"
 #include "xwin.h"
-#include <X11/keysym.h>

 static void
 WarpShapeDraw(EWin * ewin)
--- a/src/x.c
+++ b/src/x.c
@ -21,13 +21,12 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "E.h"
-#include "edebug.h"
-#include "util.h"
-#include "xwin.h"
+#include "config.h"
+
 #include <string.h>
 #include <unistd.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/extensions/shape.h>
@ -35,13 +34,18 @@
 #include <X11/extensions/Xrender.h>
 #define RENDER_VERSION VERS(RENDER_MAJOR, RENDER_MINOR)
 #endif
-#if USE_GLX
-#include "eglx.h"
-#endif
 #if USE_XI2
 #include <X11/extensions/XInput2.h>
 #endif

+#include "E.h"
+#include "edebug.h"
+#include "util.h"
+#include "xwin.h"
+#if USE_GLX
+#include "eglx.h"
+#endif
+
 #define DEBUG_XWIN   0
 #define DEBUG_PIXMAP 0

--- a/src/xprop.c
+++ b/src/xprop.c
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -20,6 +20,8 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@ -27,8 +29,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

-#include "config.h"
-
 /* Window property change actions (must match _NET_WM_STATE_... ones) */
 #define EX_PROP_LIST_REMOVE    0
 #define EX_PROP_LIST_ADD       1
--- a/src/zoom.c
+++ b/src/zoom.c
@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2012 Kim Woelders
+ * Copyright (C) 2004-2015 Kim Woelders
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@ -21,15 +21,18 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+#include "config.h"
+
+#if USE_XRANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+
 #include "E.h"
 #include "borders.h"
 #include "ewins.h"
 #include "focus.h"
 #include "hints.h"
 #include "xwin.h"
-#if USE_XRANDR
-#include <X11/extensions/Xrandr.h>
-#endif

 #define DEBUG_ZOOM 0
 #if DEBUG_ZOOM