diff --git a/src/Makefile.am b/src/Makefile.am
index 87e632ef..4656cd9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ forked_daapd_SOURCES = main.c \
 	conffile.c conffile.h \
 	filescanner.c filescanner.h \
 	filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c $(ITUNESSRC) \
-	mdns_avahi.c mdns_avahi.h \
+	mdns_avahi.c mdns.h \
 	remote_pairing.c remote_pairing.h \
 	evhttp/http.c evhttp/evhttp.h \
 	evhttp/http-internal.h evhttp/log.h \
diff --git a/src/main.c b/src/main.c
index 8aa89980..31415924 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,7 +61,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #include "misc.h"
 #include "filescanner.h"
 #include "httpd.h"
-#include "mdns_avahi.h"
+#include "mdns.h"
 #include "remote_pairing.h"
 #include "player.h"
 #include "ffmpeg_url_evbuffer.h"
diff --git a/src/mdns_avahi.h b/src/mdns.h
similarity index 84%
rename from src/mdns_avahi.h
rename to src/mdns.h
index 5dd22cad..fb22bdd8 100644
--- a/src/mdns_avahi.h
+++ b/src/mdns.h
@@ -1,6 +1,6 @@
 
-#ifndef __MDNS_AVAHI_H__
-#define __MDNS_AVAHI_H__
+#ifndef __MDNS_H__
+#define __MDNS_H__
 
 #include <avahi-common/strlst.h>
 
@@ -20,4 +20,4 @@ mdns_register(char *name, char *type, int port, char **txt);
 int
 mdns_browse(char *type, mdns_browse_cb cb);
 
-#endif /* !__MDNS_AVAHI_H__ */
+#endif /* !__MDNS_H__ */
diff --git a/src/mdns_avahi.c b/src/mdns_avahi.c
index 238fb577..5dcb976f 100644
--- a/src/mdns_avahi.c
+++ b/src/mdns_avahi.c
@@ -42,7 +42,7 @@
 #include <avahi-client/lookup.h>
 
 #include "logger.h"
-#include "mdns_avahi.h"
+#include "mdns.h"
 
 
 /* Main event base, from main.c */
diff --git a/src/player.c b/src/player.c
index f198a377..372325a7 100644
--- a/src/player.c
+++ b/src/player.c
@@ -52,7 +52,7 @@
 #include "db.h"
 #include "daap_query.h"
 #include "logger.h"
-#include "mdns_avahi.h"
+#include "mdns.h"
 #include "conffile.h"
 #include "misc.h"
 #include "rng.h"
diff --git a/src/remote_pairing.c b/src/remote_pairing.c
index 15b68b95..bd384f7e 100644
--- a/src/remote_pairing.c
+++ b/src/remote_pairing.c
@@ -54,7 +54,7 @@
 
 #include "logger.h"
 #include "conffile.h"
-#include "mdns_avahi.h"
+#include "mdns.h"
 #include "misc.h"
 #include "db.h"
 #include "remote_pairing.h"