diff --git a/src/or/connection.c b/src/or/connection.c
index 7b1493bfc5..82764ec4ce 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -11,6 +11,7 @@
  **/
 
 #include "or.h"
+#include "dnsserv.h"
 
 static connection_t *connection_create_listener(
                                struct sockaddr *listensockaddr,
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index a173dc1226..941f7b7e56 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -10,6 +10,7 @@
  **/
 
 #include "or.h"
+#include "dnsserv.h"
 
 #ifdef HAVE_LINUX_TYPES_H
 #include <linux/types.h>
diff --git a/src/or/control.c b/src/or/control.c
index ab17bec8a4..68921663e1 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -11,6 +11,7 @@
 #define CONTROL_PRIVATE
 
 #include "or.h"
+#include "dnsserv.h"
 
 /** Yield true iff <b>s</b> is the state of a control_connection_t that has
  * finished authentication and is accepting commands. */
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 2e5301eae0..390ef2f7b1 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -9,6 +9,7 @@
  **/
 
 #include "or.h"
+#include "dnsserv.h"
 #ifdef HAVE_EVENT2_DNS_H
 #include <event2/dns.h>
 #include <event2/dns_compat.h>
diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h
new file mode 100644
index 0000000000..f3b73d45a8
--- /dev/null
+++ b/src/or/dnsserv.h
@@ -0,0 +1,26 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file dnsserv.h
+ * \brief Header file for dnsserv functions
+ **/
+
+#ifndef _TOR_DNSSERV_H
+#define _TOR_DNSSERV_H
+
+void dnsserv_configure_listener(connection_t *conn);
+void dnsserv_close_listener(connection_t *conn);
+void dnsserv_resolved(edge_connection_t *conn,
+                      int answer_type,
+                      size_t answer_len,
+                      const char *answer,
+                      int ttl);
+void dnsserv_reject_request(edge_connection_t *conn);
+int dnsserv_launch_request(const char *name, int is_reverse);
+
+#endif
+
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 7f6cf79d8b..248c68ea46 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -10,6 +10,7 @@
 #define GEOIP_PRIVATE
 #include "or.h"
 #include "ht.h"
+#include "dnsserv.h"
 
 static void clear_geoip_db(void);
 
diff --git a/src/or/main.c b/src/or/main.c
index 0dcc45464a..521d2c2ca7 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -12,6 +12,7 @@
 
 #define MAIN_PRIVATE
 #include "or.h"
+#include "dnsserv.h"
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
 #include <openssl/crypto.h>
diff --git a/src/or/or.h b/src/or/or.h
index 2321f2f3c2..10165d4937 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4092,18 +4092,6 @@ int dns_seems_to_be_broken(void);
 void dns_reset_correctness_checks(void);
 void dump_dns_mem_usage(int severity);
 
-/********************************* dnsserv.c ************************/
-
-void dnsserv_configure_listener(connection_t *conn);
-void dnsserv_close_listener(connection_t *conn);
-void dnsserv_resolved(edge_connection_t *conn,
-                      int answer_type,
-                      size_t answer_len,
-                      const char *answer,
-                      int ttl);
-void dnsserv_reject_request(edge_connection_t *conn);
-int dnsserv_launch_request(const char *name, int is_reverse);
-
 /********************************* geoip.c **************************/
 
 /** Round all GeoIP results to the next multiple of this value, to avoid