diff --git a/awesome-client-common.c b/awesome-client-common.c
index a2217b6a..79916d29 100644
--- a/awesome-client-common.c
+++ b/awesome-client-common.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <stdio.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
diff --git a/awesome-client.c b/awesome-client.c
index 6d6886cb..a8e88fd6 100644
--- a/awesome-client.c
+++ b/awesome-client.c
@@ -22,6 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
diff --git a/common.h b/common.h
deleted file mode 100644
index c90ac2e9..00000000
--- a/common.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * common.h - common defines
- *
- * Copyright © 2007 Julien Danjou <julien@danjou.info>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef AWESOME_COMMON_H
-#define AWESOME_COMMON_H
-
-#include "config.h"
-
-/** Common prototype definition for layouts function */
-#define LAYOUT_PROTO(name)         void name(int)
-
-#endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/draw.h b/draw.h
index 8384bc4c..1db63600 100644
--- a/draw.h
+++ b/draw.h
@@ -22,6 +22,9 @@
 #ifndef AWESOME_DRAW_H
 #define AWESOME_DRAW_H
 
+#include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
+
 typedef struct
 {
     /* Co-ords of upper left corner */
diff --git a/layout.h b/layout.h
index b4e9f522..22f2296a 100644
--- a/layout.h
+++ b/layout.h
@@ -27,6 +27,8 @@
 
 #define AWESOMEPROPS_ATOM(disp)                    XInternAtom(disp, "_AWESOME_PROPERTIES", False)
 
+typedef void (LayoutArrange)(int);
+
 void arrange(int);
 void restack(int);
 void loadawesomeprops(int);
diff --git a/layouts/fibonacci.h b/layouts/fibonacci.h
index 382a6a1a..d2a4aacf 100644
--- a/layouts/fibonacci.h
+++ b/layouts/fibonacci.h
@@ -22,10 +22,10 @@
 #ifndef AWESOME_FIBONACCI_H
 #define AWESOME_FIBONACCI_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_spiral);
-LAYOUT_PROTO(layout_dwindle);
+LayoutArrange layout_spiral;
+LayoutArrange layout_dwindle;
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/floating.h b/layouts/floating.h
index 4b98ade9..6bd5a0d6 100644
--- a/layouts/floating.h
+++ b/layouts/floating.h
@@ -23,9 +23,9 @@
 #ifndef AWESOME_FLOATING_H
 #define AWESOME_FLOATING_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_floating);
+LayoutArrange layout_floating;
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/max.h b/layouts/max.h
index bbf0e2e1..ddfe5360 100644
--- a/layouts/max.h
+++ b/layouts/max.h
@@ -22,9 +22,9 @@
 #ifndef AWESOME_MAX_H
 #define AWESOME_MAX_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_max);
+LayoutArrange layout_max;
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/tile.h b/layouts/tile.h
index 82c6af15..37730da1 100644
--- a/layouts/tile.h
+++ b/layouts/tile.h
@@ -23,10 +23,10 @@
 #ifndef AWESOME_TILE_H
 #define AWESOME_TILE_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_tile);
-LAYOUT_PROTO(layout_tileleft);
+LayoutArrange layout_tile;
+LayoutArrange layout_tileleft;
 
 Uicb uicb_tag_setnmaster;
 Uicb uicb_tag_setncol;
diff --git a/util.h b/util.h
index 5599490b..d806edc0 100644
--- a/util.h
+++ b/util.h
@@ -25,7 +25,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "common.h"
 
 /** Link a name to a function */
 typedef struct
diff --git a/window.c b/window.c
index 523ed37d..16b4322b 100644
--- a/window.c
+++ b/window.c
@@ -22,6 +22,7 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h> 
 
+#include "config.h"
 #include "window.h"
 #include "util.h"
 
diff --git a/xutil.h b/xutil.h
index 946a2a60..9f7a4cef 100644
--- a/xutil.h
+++ b/xutil.h
@@ -22,7 +22,6 @@
 #ifndef AWESOME_XUTIL_H
 #define AWESOME_XUTIL_H
 
-#include "common.h"
 #include "screen.h"
 
 Bool xgettextprop(Display *, Window, Atom, char *, ssize_t);