diff --git a/src/apps/mdns/mdns.c b/src/apps/mdns/mdns.c
index 7c54bc55..8e29de63 100644
--- a/src/apps/mdns/mdns.c
+++ b/src/apps/mdns/mdns.c
@@ -1,6 +1,27 @@
 /**
  * @file
  * MDNS responder implementation
+ *
+ * @defgroup mdns MDNS
+ * @ingroup apps
+ *
+ * RFC 6762 - Multicast DNS\n
+ * RFC 6763 - DNS-Based Service Discovery\n
+ * 
+ * @verbinclude mdns.txt
+ * 
+ * Things left to implement:
+ * -------------------------
+ *
+ * - Probing/conflict resolution
+ * - Sending goodbye messages (zero ttl)
+ * - Checking that source address of unicast requests are on the same network
+ * - Limiting multicast responses to 1 per second per resource record
+ * - Fragmenting replies if required
+ * - Subscribe to netif address/link change events and act on them
+ * - Handling multi-packet known answers
+ * - Individual known answer detection for all local IPv6 addresses
+ * - Dynamic size of outgoing packet
  */
 
 /*
@@ -38,31 +59,6 @@
  *
  */
 
-/**
- * @defgroup mdns MDNS
- * @ingroup apps
- *
- * RFC 6762 - Multicast DNS\n
- * RFC 6763 - DNS-Based Service Discovery\n
- * 
- * @verbinclude mdns.txt
- * 
- * Things left to implement:
- * -------------------------
- *
- * - Probing/conflict resolution
- * - Sending goodbye messages (zero ttl)
- * - Checking that source address of unicast requests are on the same network
- * - Limiting multicast responses to 1 per second per resource record
- * - Fragmenting replies if required
- * - Subscribe to netif address/link change events and act on them
- * - Handling multi-packet known answers
- * - Individual known answer detection for all local IPv6 addresses
- * - Dynamic size of outgoing packet
- */
-
-#include "lwip/opt.h"
-
 #include "lwip/apps/mdns.h"
 #include "lwip/netif.h"
 #include "lwip/udp.h"
diff --git a/src/include/lwip/apps/mdns.h b/src/include/lwip/apps/mdns.h
index 08fa5df7..2391f1dd 100644
--- a/src/include/lwip/apps/mdns.h
+++ b/src/include/lwip/apps/mdns.h
@@ -32,7 +32,7 @@
 #ifndef LWIP_HDR_MDNS_H
 #define LWIP_HDR_MDNS_H
 
-#include "lwip/opt.h"
+#include "lwip/apps/mdns_opts.h"
 #include "lwip/netif.h"
 
 #if LWIP_MDNS