cleanup #includes

Signed-off-by: Julien Danjou <julien@danjou.info>

awesome.c

@@ -45,7 +45,7 @@
 #include "common/version.h"
 #include "common/atoms.h"
 #include "common/xcursor.h"
-#include "config.h"
+#include "common/xutil.h"
 
 awesome_t globalconf;
 

client.c

@@ -24,15 +24,14 @@
 
 #include "cnode.h"
 #include "tag.h"
-#include "window.h"
 #include "ewmh.h"
 #include "screen.h"
 #include "titlebar.h"
 #include "systray.h"
 #include "property.h"
-#include "wibox.h"
 #include "spawn.h"
 #include "common/atoms.h"
+#include "common/xutil.h"
 
 DO_LUA_TOSTRING(client_t, client, "client")
 

client.h

@@ -24,7 +24,6 @@
 
 #include "mouse.h"
 #include "stack.h"
-#include "common/list.h"
 
 #define CLIENT_SELECT_INPUT_EVENT_MASK (XCB_EVENT_MASK_STRUCTURE_NOTIFY \
                                         | XCB_EVENT_MASK_PROPERTY_CHANGE \

cnode.h

@@ -23,6 +23,7 @@
 #define AWESOME_CNODE_H
 
 #include "client.h"
+#include "common/list.h"
 
 struct client_node
 {

common/xutil.h

@@ -27,9 +27,6 @@
 #include <xcb/xcb_aux.h>
 #include <xcb/xcb_event.h>
 
-/* XCB doesn't provide keysyms definition */
-#include <X11/keysym.h>
-
 #include "array.h"
 
 bool xutil_text_prop_get(xcb_connection_t *, xcb_window_t, xcb_atom_t, char **, ssize_t *);

dbus.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include "config.h"
 #include "dbus.h"
 #include "client.h"
 
@@ -30,7 +29,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "widget.h"
 #include "event.h"
 
 static DBusError err;

draw.c

@@ -32,6 +32,7 @@
 #include "structs.h"
 
 #include "common/tokenize.h"
+#include "common/xutil.h"
 
 /** Convert text from any charset to UTF-8 using iconv.
  * \param iso The ISO string to convert.

event.c

@@ -40,6 +40,7 @@
 #include "systray.h"
 #include "screen.h"
 #include "common/atoms.h"
+#include "common/xutil.h"
 
 /** Handle mouse button events.
  * \param c The client on which the event happened or NULL.

event.h

@@ -22,8 +22,6 @@
 #ifndef AWESOME_EVENT_H
 #define AWESOME_EVENT_H
 
-#include <xcb/xcb.h>
-
 #include "wibox.h"
 #include "layout.h"
 #include "client.h"

ewmh.c

@@ -34,6 +34,7 @@
 #include "wibox.h"
 #include "common/atoms.h"
 #include "common/buffer.h"
+#include "common/xutil.h"
 
 #define _NET_WM_STATE_REMOVE 0
 #define _NET_WM_STATE_ADD 1

image.c

@@ -20,6 +20,7 @@
  */
 
 #include "structs.h"
+#include "common/tokenize.h"
 
 DO_LUA_TOSTRING(image_t, image, "image");
 

key.c

@@ -24,6 +24,7 @@
 #include <X11/Xlib.h>
 
 #include "structs.h"
+#include "common/xutil.h"
 
 LUA_OBJECT_FUNCS(keyb_t, key, "key")
 

key.h

@@ -22,9 +22,7 @@
 #ifndef AWESOME_KEYBINDING_H
 #define AWESOME_KEYBINDING_H
 
-#include <xcb/xcb.h>
 #include "luaa.h"
-#include "common/luaobject.h"
 
 typedef struct keyb_t
 {

keygrabber.c

@@ -19,11 +19,15 @@
  *
  */
 
+/* XCB doesn't provide keysyms definition */
+#include <X11/keysym.h>
+
 #include <unistd.h>
 
 #include "structs.h"
 #include "keygrabber.h"
 #include "key.h"
+#include "common/xutil.h"
 
 /** XCB equivalent of XLookupString which translate the keycode given
  * by PressEvent to a KeySym and a string

luaa.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/util.h"
+#define _GNU_SOURCE
 
 #include <ev.h>
 
@@ -27,21 +27,17 @@
 #include <lauxlib.h>
 #include <lualib.h>
 
-#include <xcb/xcb.h>
-
 #include <basedir_fs.h>
 
 #include "awesome.h"
 #include "awesome-version-internal.h"
 #include "ewmh.h"
-#include "config.h"
 #include "luaa.h"
 #include "spawn.h"
 #include "tag.h"
 #include "client.h"
 #include "screen.h"
 #include "event.h"
-#include "mouse.h"
 #include "selection.h"
 #include "window.h"
 #include "common/xcursor.h"

luaa.h

@@ -29,11 +29,7 @@
 
 #include <basedir.h>
 
-#include <stdio.h>
-
 #include "draw.h"
-#include "common/util.h"
-#include "common/luaobject.h"
 
 #define luaA_deprecate(L, repl) \
     luaA_warn(L, "%s: This function is deprecated and will be removed, see %s", \

mouse.c

@@ -21,11 +21,10 @@
 
 #include <math.h>
 
-#include "common/tokenize.h"
 #include "screen.h"
 #include "tag.h"
-#include "wibox.h"
 #include "common/xcursor.h"
+#include "common/xutil.h"
 
 DO_LUA_TOSTRING(button_t, button, "button")
 LUA_OBJECT_FUNCS(button_t, button, "button")

mousegrabber.c

@@ -24,6 +24,7 @@
 #include "mouse.h"
 #include "mousegrabber.h"
 #include "common/xcursor.h"
+#include "common/xutil.h"
 
 /** Grab the mouse.
  * \param cursor The cursor to use while grabbing.

property.c

@@ -24,9 +24,9 @@
 #include "screen.h"
 #include "property.h"
 #include "client.h"
-#include "widget.h"
 #include "ewmh.h"
 #include "common/atoms.h"
+#include "common/xutil.h"
 
 void
 property_update_wm_transient_for(client_t *c, xcb_get_property_reply_t *reply)

root.c

@@ -23,6 +23,8 @@
 
 #include "mouse.h"
 #include "common/xcursor.h"
+#include "common/tokenize.h"
+#include "common/xutil.h"
 
 /** Send fake events. Usually the current focused client will get it.
  * \param L The Lua VM state.

screen.c

@@ -30,6 +30,7 @@
 #include "client.h"
 #include "widget.h"
 #include "wibox.h"
+#include "common/xutil.h"
 
 static inline area_t
 screen_xsitoarea(xcb_xinerama_screen_info_t si)

screen.h

@@ -22,7 +22,6 @@
 #ifndef AWESOME_SCREEN_H
 #define AWESOME_SCREEN_H
 
-#include "structs.h"
 #include "wibox.h"
 
 struct a_screen

selection.c

@@ -23,9 +23,9 @@
 #include <xcb/xcb_atom.h>
 
 #include "selection.h"
-#include "structs.h"
 #include "event.h"
 #include "common/atoms.h"
+#include "common/xutil.h"
 
 static xcb_window_t selection_window = XCB_NONE;
 

spawn.h

@@ -22,7 +22,6 @@
 #ifndef AWESOME_SPAWN_H
 #define AWESOME_SPAWN_H
 
-#include <lua.h>
 #include "structs.h"
 
 void spawn_init(void);

stack.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include "stack.h"
 #include "cnode.h"
 #include "ewmh.h"
 

structs.h

@@ -26,15 +26,11 @@
 #include <libsn/sn.h>
 
 #include <xcb/xcb_icccm.h>
-#include <xcb/xcb_property.h>
+#include <xcb/xcb_keysyms.h>
 
 #include "config.h"
-#include "luaa.h"
-#include "swindow.h"
 #include "key.h"
-#include "common/xutil.h"
 #include "common/xembed.h"
-#include "common/tokenize.h"
 
 typedef struct wibox_t wibox_t;
 typedef struct a_screen screen_t;

swindow.h

@@ -23,7 +23,6 @@
 #define AWESOME_SWINDOW_H
 
 #include "draw.h"
-#include "common/util.h"
 
 /** A simple window. */
 typedef struct simple_window_t

systray.c

@@ -28,6 +28,7 @@
 #include "window.h"
 #include "widget.h"
 #include "common/atoms.h"
+#include "common/xutil.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK 0 /* Begin icon docking */
 

tag.h

@@ -22,7 +22,6 @@
 #ifndef AWESOME_TAG_H
 #define AWESOME_TAG_H
 
-#include "structs.h"
 #include "client.h"
 
 /** Tag type */

wibox.c

@@ -25,8 +25,9 @@
 #include "client.h"
 #include "ewmh.h"
 #include "screen.h"
-#include "common/xcursor.h"
 #include "window.h"
+#include "common/xcursor.h"
+#include "common/xutil.h"
 
 DO_LUA_TOSTRING(wibox_t, wibox, "wibox")
 

widget.c

@@ -30,6 +30,7 @@
 #include "wibox.h"
 #include "client.h"
 #include "common/atoms.h"
+#include "common/xutil.h"
 
 #include "widgetgen.h"
 

widget.h

@@ -23,6 +23,7 @@
 #define AWESOME_WIDGET_H
 
 #include "mouse.h"
+#include "common/tokenize.h"
 
 typedef widget_t *(widget_constructor_t)(widget_t *);
 typedef void (widget_destructor_t)(widget_t *);