4 files changed, 8 insertions, 9 deletions
diff --git a/avahi-common/dbus-watch-glue.c b/avahi-common/dbus-watch-glue.c
index 80d35f2..46fcc90 100644
--- a/avahi-common/dbus-watch-glue.c
+++ b/avahi-common/dbus-watch-glue.c
@@ -22,8 +22,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <avahi-common/malloc.h>
-
+#include "malloc.h"
+#include "timeval.h"
 #include "dbus-watch-glue.h"
 
 static AvahiWatchEvent translate_dbus_to_avahi(unsigned int f) {
diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
index 2a15c5e..3633521 100644
--- a/avahi-common/simple-watch.c
+++ b/avahi-common/simple-watch.c
@@ -31,9 +31,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <avahi-common/llist.h>
-#include <avahi-common/malloc.h>
-
+#include "llist.h"
+#include "malloc.h"
+#include "timeval.h"
 #include "simple-watch.h"
 
 struct AvahiWatch {
diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h
index 0833570..5a4b37d 100644
--- a/avahi-common/simple-watch.h
+++ b/avahi-common/simple-watch.h
@@ -26,8 +26,7 @@
 
 #include <sys/poll.h>
 #include <avahi-common/cdecl.h>
-
-#include "watch.h"
+#include <avahi-common/watch.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
diff --git a/avahi-common/watch.h b/avahi-common/watch.h
index 9f82729..b973683 100644
--- a/avahi-common/watch.h
+++ b/avahi-common/watch.h
@@ -25,9 +25,9 @@
 /** \file watch.h Simplistic main loop abstraction */
 
 #include <sys/poll.h>
-#include <avahi-common/cdecl.h>
+#include <sys/time.h>
 
-#include "timeval.h"
+#include <avahi-common/cdecl.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN