diff --git a/.gitignore b/.gitignore
index 8c04291ec2eb7da87aba3a3ea9e495fcf0f0e01b..eba9c5bf714b647478dfe1b774db62b3c6950536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,9 @@ Makefile.in
 /ltmain.sh
 /missing
 /stamp-h1
+src/config.*
 src/modbus-version.h
+src/stamp-h1
 src/win32/modbus.dll.manifest
 tests/unit-test.h
 
diff --git a/configure.ac b/configure.ac
index 920612f060b2d5675d4f2cd13305f3969f36ef93..4b880eeeb3a611bdcc337688a1cea9d6d728ae68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ AC_ARG_ENABLE(tests,
 	[enable_tests=yes])
 AM_CONDITIONAL(BUILD_TESTS, [test $enable_tests != no])
 
-AC_CONFIG_HEADERS([config.h tests/unit-test.h])
+AC_CONFIG_HEADERS([src/config.h tests/unit-test.h])
 AC_CONFIG_FILES([
         Makefile
         src/Makefile
diff --git a/src/modbus-data.c b/src/modbus-data.c
index 1e3900418ebda05e50e65bc83ac981c884137093..3200d30ee5b0f19111126e558b3c1088d6ccf3af 100644
--- a/src/modbus-data.c
+++ b/src/modbus-data.c
@@ -22,7 +22,7 @@
 #  include <arpa/inet.h>
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #include "modbus.h"
 
diff --git a/src/modbus-private.h b/src/modbus-private.h
index ea83187f782bf2c62f2c7c3ac72ff5951fc54e25..1c88956a656eda304906c40601ee2df81ca4f48b 100644
--- a/src/modbus-private.h
+++ b/src/modbus-private.h
@@ -17,7 +17,7 @@
 typedef int ssize_t;
 #endif
 // clang-format on
-#include <config.h>
+#include "config.h"
 #include <sys/types.h>
 
 #include "modbus.h"
diff --git a/src/modbus-tcp.c b/src/modbus-tcp.c
index cd63f79f556f4cc4914d3c728cc217d90224c32e..45ea616c468ff61c8f15ad13050f262c7f2a2006 100644
--- a/src/modbus-tcp.c
+++ b/src/modbus-tcp.c
@@ -42,12 +42,8 @@
 # include <netinet/in_systm.h>
 #endif
 
-#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
-#ifdef HAVE_NETINET_IP_H
 #include <netinet/ip.h>
-#endif /* HAVE_NETINET_IP_H */
 # include <netinet/tcp.h>
 # include <arpa/inet.h>
 # include <netdb.h>
diff --git a/src/modbus.c b/src/modbus.c
index c1fe6aef561e5fc0ce920284f5d557cdb9a59848..52ac2fb629717bc8a590ef6887e2c503c27a07d9 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #include "modbus-private.h"
 #include "modbus.h"
diff --git a/src/win32/configure.js b/src/win32/configure.js
index 5a579b9e5ea7ef03d568cb20695053997ba9f40c..23249ff97ff06fa1e91925cf39f565da13218238 100644
--- a/src/win32/configure.js
+++ b/src/win32/configure.js
@@ -165,7 +165,7 @@ if (error !== 0) {
 }
 WScript.Echo(newfile + " created.");
 
-newfile = "config.h";
+newfile = srcDir + "\\config.h";
 createVersionedFile(newfile, "config.h.win32");
 if (error !== 0) {
     WScript.Echo("Creation of " + newfile + " failed, aborting.");