rework headers inclusion

client.c

@@ -25,9 +25,7 @@
 #include <X11/extensions/Xinerama.h>
 
 #include "client.h"
-#include "screen.h"
 #include "awesome.h"
-#include "layout.h"
 #include "tag.h"
 #include "rules.h"
 #include "util.h"
@@ -36,6 +34,7 @@
 #include "window.h"
 #include "focus.h"
 #include "ewmh.h"
+#include "screen.h"
 #include "layouts/floating.h"
 
 

client.h

@@ -23,7 +23,6 @@
 #define AWESOME_CLIENT_H
 
 #include "config.h"
-#include "uicb.h"
 
 Bool client_isvisible(Client *, int);
 Client * get_client_bywin(Client *, Window);

config.c

@@ -23,7 +23,6 @@
  * @defgroup ui_callback User Interface Callbacks
  */
 
-#include <confuse.h>
 #include <X11/keysym.h>
 
 #include "statusbar.h"

config.h

@@ -22,11 +22,8 @@
 #ifndef AWESOME_CONFIG_H
 #define AWESOME_CONFIG_H
 
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
 #include <regex.h>
 #include "draw.h"
-#include "uicb.h"
 #include "layout.h"
 
 /** Bar possible position */

draw.c

@@ -23,10 +23,8 @@
 #include <cairo-ft.h>
 #include <cairo-xlib.h>
 #include <math.h>
-#include "config.h"
-#include "layout.h"
 #include "util.h"
-#include "draw.h"
+#include "config.h"
 
 extern AwesomeConf globalconf;
 

event.c

@@ -27,9 +27,7 @@
 
 #include "screen.h"
 #include "event.h"
-#include "layout.h"
 #include "tag.h"
-#include "draw.h"
 #include "statusbar.h"
 #include "util.h"
 #include "window.h"

event.h

@@ -22,7 +22,7 @@
 #ifndef AWESOME_EVENT_H
 #define AWESOME_EVENT_H
 
-#include "config.h"
+#include <X11/Xlib.h>
 
 #define CLEANMASK(mask)      (mask & ~(globalconf.numlockmask | LockMask))
 

ewmh.c

@@ -28,7 +28,6 @@
 #include "focus.h"
 #include "screen.h"
 #include "client.h"
-#include "layout.h"
 
 extern AwesomeConf globalconf;
 

focus.c

@@ -21,7 +21,6 @@
 
 #include "util.h"
 #include "tag.h"
-#include "layout.h"
 #include "focus.h" 
 #include "client.h"
 

focus.h

@@ -23,7 +23,6 @@
 #define AWESOME_FOCUS_H
 
 #include "config.h"
-#include "uicb.h"
 
 void focus_add_client(Client *);
 void focus_delete_client(Client *);

layout.c

@@ -22,8 +22,6 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "screen.h"
-#include "layout.h"
 #include "tag.h"
 #include "util.h"
 #include "xutil.h"
@@ -31,6 +29,7 @@
 #include "statusbar.h"
 #include "ewmh.h"
 #include "client.h"
+#include "screen.h"
 #include "layouts/tile.h"
 #include "layouts/max.h"
 #include "layouts/fibonacci.h"

screen.c

@@ -24,7 +24,6 @@
 #include "util.h"
 #include "screen.h"
 #include "tag.h"
-#include "layout.h"
 #include "focus.h"
 #include "statusbar.h"
 #include "client.h"

screen.h

@@ -23,7 +23,6 @@
 #define AWESOME_SCREEN_H
 
 #include "config.h"
-#include "uicb.h"
 
 Area get_screen_area(int, Statusbar *, Padding *);
 Area get_display_area(int, Statusbar *, Padding *);

statusbar.c

@@ -22,9 +22,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "layout.h"
 #include "statusbar.h"
-#include "draw.h"
 #include "screen.h"
 #include "util.h"
 #include "tag.h"

statusbar.h

@@ -23,7 +23,6 @@
 #define AWESOME_STATUSBAR_H
 
 #include "config.h"
-#include "uicb.h"
 
 void statusbar_draw_all(int);
 void statusbar_init(Statusbar *, int);

tag.c

@@ -23,7 +23,6 @@
 #include <X11/Xutil.h>
 
 #include "screen.h"
-#include "layout.h"
 #include "tag.h"
 #include "util.h"
 #include "rules.h"

tag.h

@@ -23,7 +23,6 @@
 #define AWESOME_TAG_H
 
 #include "config.h"
-#include "uicb.h"
 
 /** Check if a client is tiled */
 #define IS_TILED(client, screen)            (client && !client->isfloating && client_isvisible(client, screen))

uicb.c

@@ -22,14 +22,13 @@
 #include "awesome.h"
 #include "util.h"
 #include "xutil.h"
-#include "screen.h"
 #include "tag.h"
-#include "layout.h"
 #include "mouse.h"
 #include "statusbar.h"
 #include "widget.h"
 #include "focus.h"
 #include "client.h"
+#include "screen.h"
 #include "layouts/tile.h"
 
 extern AwesomeConf globalconf;

widget.h

@@ -26,8 +26,6 @@
 #include <confuse.h>
 
 #include "config.h"
-#include "draw.h"
-#include "uicb.h"
 
 enum { AlignLeft, AlignRight, AlignFlex };
 

widgets/focustitle.c

@@ -21,13 +21,13 @@
  */
 
 #include <stdio.h>
-#include <confuse.h>
 #include "util.h"
 #include "widget.h"
 #include "layout.h"
 #include "tag.h"
 #include "focus.h"
 #include "xutil.h"
+#include "screen.h"
 
 extern AwesomeConf globalconf;
 

widgets/iconbox.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <confuse.h>
 #include "util.h"
 #include "widget.h"
 

widgets/layoutinfo.c

@@ -21,7 +21,6 @@
  *
  */
 
-#include <confuse.h>
 #include "widget.h"
 #include "util.h"
 #include "tag.h"

widgets/netwmicon.c

@@ -21,7 +21,6 @@
 
 #include <X11/Xmd.h>
 #include <X11/Xatom.h>
-#include <confuse.h>
 #include "util.h"
 #include "focus.h"
 #include "tag.h"

widgets/progressbar.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <confuse.h>
 #include <string.h>
 #include "util.h"
 #include "draw.h"

widgets/taglist.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <confuse.h>
 #include "config.h"
 #include "util.h"
 #include "widget.h"

widgets/textbox.c

@@ -19,10 +19,10 @@
  *
  */
 
-#include <confuse.h>
 #include "util.h"
 #include "widget.h"
 #include "xutil.h"
+#include "screen.h"
 
 extern AwesomeConf globalconf;
 

xutil.c

@@ -23,9 +23,10 @@
 #include <X11/extensions/Xinerama.h>
 #include <sys/wait.h>
 
+#include "config.h"
 #include "util.h"
 #include "xutil.h"
-
+#include "screen.h"
 
 extern AwesomeConf globalconf;
 

xutil.h

@@ -22,7 +22,8 @@
 #ifndef AWESOME_XUTIL_H
 #define AWESOME_XUTIL_H
 
-#include "screen.h"
+#include <X11/Xlib.h>
+#include "uicb.h"
 
 Bool xgettextprop(Display *, Window, Atom, char *, ssize_t);
 XColor initxcolor(int, const char *);