diff --git a/THANKS b/THANKS
index 46d1efc..41f32f2 100644
--- a/THANKS
+++ b/THANKS
@@ -18,3 +18,4 @@ Dominic Germain
 Anders Låstad
 Thor Eivind Brantzeg
 Ahmed AL Dakhil
+Adam Ciarcinski
diff --git a/src/dhcpd-pools.h b/src/dhcpd-pools.h
index 4d785fe..26b6ce3 100644
--- a/src/dhcpd-pools.h
+++ b/src/dhcpd-pools.h
@@ -52,6 +52,12 @@ extern char *malloc();
 #define EXIT_SUCCESS	0
 #endif				/* STDC_HEADERS */
 
+#ifdef  HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
 #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 #  ifdef HAVE___PROGNAME
 extern char *__progname;
diff --git a/src/getdata.c b/src/getdata.c
index 8a0786d..01bf3e9 100644
--- a/src/getdata.c
+++ b/src/getdata.c
@@ -43,19 +43,12 @@ extern char *malloc();
 #define EXIT_SUCCESS    0	/* Successful exit status.  */
 #endif				/* STDC_HEADERS */
 
-#ifdef  HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <features.h>
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdint.h>