6 files changed, 8 insertions, 8 deletions
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index e72d54f..3aeb08d 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -54,7 +54,7 @@ libavahi_core_la_SOURCES = \
 	query-sched.c query-sched.h \
 	probe-sched.c probe-sched.h \
 	announce.c announce.h \
-	subscribe.c subscribe.h \
+	resolve.c resolve.h \
 	strlst.c strlst.h \
 	rrlist.c rrlist.h \
 	alternative.c alternative.h \
diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 1eea1c2..f031838 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "subscribe.h"
+#include "resolve.h"
 #include "util.h"
 
 struct AvahiHostNameResolver {
diff --git a/avahi-core/subscribe.c b/avahi-core/resolve.c
index db5ed88..7d0f068 100644
--- a/avahi-core/subscribe.c
+++ b/avahi-core/resolve.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "subscribe.h"
+#include "resolve.h"
 #include "util.h"
 
 static void elapse(AvahiTimeEvent *e, void *userdata) {
diff --git a/avahi-core/subscribe.h b/avahi-core/resolve.h
index 23b12e5..7de75d4 100644
--- a/avahi-core/subscribe.h
+++ b/avahi-core/resolve.h
@@ -1,5 +1,5 @@
-#ifndef foosubscribehfoo
-#define foosubscribehfoo
+#ifndef fooresolvehfoo
+#define fooresolvehfoo
 
 /* $Id$ */
 
@@ -24,7 +24,7 @@
 
 #include "llist.h"
 #include "core.h"
-#include "subscribe.h"
+#include "resolve.h"
 #include "timeeventq.h"
 #include "server.h"
 
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 1511ac4..3e9baaf 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -33,7 +33,7 @@
 #include "util.h"
 #include "iface.h"
 #include "socket.h"
-#include "subscribe.h"
+#include "resolve.h"
 
 #define AVAHI_HOST_RR_HOLDOFF_MSEC 1000
 
diff --git a/avahi-core/server.h b/avahi-core/server.h
index 809ced1..0f0fde2 100644
--- a/avahi-core/server.h
+++ b/avahi-core/server.h
@@ -28,7 +28,7 @@
 #include "llist.h"
 #include "timeeventq.h"
 #include "announce.h"
-#include "subscribe.h"
+#include "resolve.h"
 #include "dns.h"
 #include "rrlist.h"