diff --git a/src/compositor.h b/src/compositor.h
index 8fc5ab031..045c8aced 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -24,7 +24,6 @@
 #ifndef _WAYLAND_SYSTEM_COMPOSITOR_H_
 #define _WAYLAND_SYSTEM_COMPOSITOR_H_
 
-#include <libudev.h>
 #include <pixman.h>
 #include <wayland-server.h>
 
diff --git a/src/evdev.h b/src/evdev.h
index 4e298149c..b05c855c0 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -20,6 +20,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <libudev.h>
+
 void
 evdev_add_devices(struct udev *udev, struct weston_input_device
 		  *input_base);
diff --git a/src/tty.c b/src/tty.c
index 4c57dbc0f..78d5ba5db 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -31,6 +31,8 @@
 #include <linux/vt.h>
 #include <linux/major.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "compositor.h"