diff --git a/Makefile.in b/Makefile.in
index 7c641712c..1f035725d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -894,10 +894,10 @@ rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h $(srcdir)/itera
  $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
-edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/config_file.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/util/regional.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
+edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/edns.h $(srcdir)/util/config_file.h \
+ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
+ $(srcdir)/util/regional.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/packed_rrset.h
 dnstree.lo dnstree.o: $(srcdir)/util/storage/dnstree.c config.h $(srcdir)/util/storage/dnstree.h \
  $(srcdir)/util/rbtree.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
diff --git a/doc/Changelog b/doc/Changelog
index b9bbd8720..bb96b35b8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -30,6 +30,7 @@
 	  declaration shadows a local variable in libunbound.c
 	  no need for another variable "ns"; gets rid of compiler warning:
 	  declaration shadows a local variable in iterator.c
+	- Moved includes and make depend.
 
 23 January 2018: Wouter
 	- Patch from Manabu Sonoda with tls-ciphers and tls-ciphersuites
diff --git a/util/edns.c b/util/edns.c
index 1fa6b2921..d19952df0 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -40,9 +40,8 @@
  */
 
 #include "config.h"
-
-#include "util/config_file.h"
 #include "util/edns.h"
+#include "util/config_file.h"
 #include "util/netevent.h"
 #include "util/regional.h"
 #include "util/data/msgparse.h"
diff --git a/util/mini_event.c b/util/mini_event.c
index ee517b263..faadf1a23 100644
--- a/util/mini_event.c
+++ b/util/mini_event.c
@@ -49,7 +49,6 @@
 
 #if defined(USE_MINI_EVENT) && !defined(USE_WINSOCK)
 #include <signal.h>
-#include "util/mini_event.h"
 #include "util/fptr_wlist.h"
 
 /** compare events in tree, based on timevalue, ptr for uniqueness */