diff --git a/config.h b/config.h
index 5d4d3c93d..2065f42dd 100644
--- a/config.h
+++ b/config.h
@@ -25,7 +25,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 #include <regex.h>
-#include <draw.h>
+#include "draw.h"
 
 /** Bar possible position */
 enum
diff --git a/draw.h b/draw.h
index 6d07bfd58..fece15ccd 100644
--- a/draw.h
+++ b/draw.h
@@ -22,10 +22,7 @@
 #ifndef AWESOME_DRAW_H
 #define AWESOME_DRAW_H
 
-#include "config.h"
-
-typedef struct DrawCtx DrawCtx;
-struct DrawCtx
+typedef struct
 {
     Display *display;
     Drawable drawable;
@@ -34,7 +31,7 @@ struct DrawCtx
     int height;
     int phys_screen;
     int depth;
-};
+} DrawCtx;
 
 DrawCtx *draw_get_context(Display*, int, int, int);
 void draw_free_context(DrawCtx*);
@@ -46,5 +43,6 @@ void draw_image_from_argb_data(DrawCtx *, int, int, int, int, int, unsigned char
 int draw_get_image_width(const char *filename);
 Drawable draw_rotate(DrawCtx *, int, double, int, int);
 unsigned short textwidth(XftFont *, char *);
+
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80