diff --git a/doc/Changelog b/doc/Changelog
index 8fae848c3..b53e38e66 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 25 October 2017: Ralph
 	- Fixed libunbound manual typo.
 	- Fix #1949: [dnscrypt] make provider name mismatch more obvious.
+	- Fix #2031: Double included headers
 
 24 October 2017: Ralph
 	- Update B root ipv4 address.
diff --git a/services/localzone.c b/services/localzone.c
index 6bde432e8..90106d5c8 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -52,7 +52,6 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgparse.h"
 #include "util/as112.h"
-#include "util/config_file.h"
 
 /* maximum RRs in an RRset, to cap possible 'endless' list RRs.
  * with 16 bytes for an A record, a 64K packet has about 4000 max */
diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index d662991ba..57883d183 100644
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -433,7 +433,6 @@ rtt_test(void)
 }
 
 #include "services/cache/infra.h"
-#include "util/config_file.h"
 
 /* lookup and get key and data structs easily */
 static struct infra_data* infra_lookup_host(struct infra_cache* infra,
diff --git a/util/configlexer.lex b/util/configlexer.lex
index c30c44b5d..793c70bcb 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -14,7 +14,6 @@
 #endif
 
 #include <ctype.h>
-#include <string.h>
 #include <strings.h>
 #ifdef HAVE_GLOB_H
 # include <glob.h>
diff --git a/util/ub_event.c b/util/ub_event.c
index 3b92be1a3..fba2f2488 100644
--- a/util/ub_event.c
+++ b/util/ub_event.c
@@ -427,7 +427,7 @@ ub_winsock_tcp_wouldblock(struct ub_event* ev, int eventbits)
 
 void ub_comm_base_now(struct comm_base* cb)
 {
-	#ifdef USE_MINI_EVENT
+#ifdef USE_MINI_EVENT
 /** minievent updates the time when it blocks. */
 	(void)cb; /* nothing to do */
 #else /* !USE_MINI_EVENT */