diff --git a/configure.in b/configure.in
index 885901371bdb0620f9a1616231277bb52b3f2b9e..364a3d88cd3655ab0527cdc930fcfdd396bfc340 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,7 @@ AC_SEARCH_LIBS([dlopen], [dl])
 AC_CHECK_HEADERS(jtag_minidriver.h)
 AC_CHECK_HEADERS(sys/param.h)
 AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_HEADERS(sys/select.h)
 AC_CHECK_HEADERS(elf.h)
 AC_CHECK_HEADERS(strings.h)
 AC_CHECK_HEADERS(stdbool.h)
diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c
index 625137047a0477902a246a1d9c82492a5c2c3dc8..d0b3ff0137d08cb8a112cf7e4286714b9874d65d 100644
--- a/src/helper/jim-eventloop.c
+++ b/src/helper/jim-eventloop.c
@@ -62,6 +62,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <errno.h>
 
 #include "replacements.h"
diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 2725d945e2dd4dfc92709637a8afb5aeb6e0a1da..8e1e51d06f445cbe24342cc9c6f4d22d797cb546 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -35,7 +35,14 @@
 #if BUILD_ECOSBOARD
 #include <pkgconf/system.h>
 #include <stdlib.h>
-#include <sys/select.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H 
+#include <sys/select.h> /* select, FD_SET and friends (POSIX.1-2001) */
+#endif
+
+#ifdef HAVE_SYS_TIME_H 
+#include <sys/time.h> /* FD_SET and friends (pre-POSIX.1-2001) */
 #endif
 
 /* include necessary headers for socket functionality */
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 91d0863891c6ecf6f33827a4b6eccf0ba8d392e4..c1e2648b95832ce33a86133c91701a0ef9645df8 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -35,9 +35,12 @@
 #include "command.h"
 #include "log.h"
 
-#include "stdlib.h"
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 /* note that this is not marked as static as it must be available from outside jtag.c for those
    that implement the jtag_xxx() minidriver layer