diff --git a/CHANGES b/CHANGES
index e9a6c9ebc4a40a5b395377c3e7ade28f9fad5bc0..b5bd740efa19447da88adb5ff5f27988a8818e53 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,8 @@ Yang Tse (14 Jul 2008)
   file has been included. In this way if symbol is defined in the config file
   it will no longer be ignored.
 
+- Removed inclusion of remaining system header files from configuration files.
+
 Yang Tse (11 Jul 2008)
 - Added missing multiple header inclusion prevention definition for header
   file content_encoding.h
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 85714b84b468321ac142e2f3ec453d9e3d3e1648..ee86bab413ac6c32373dcfd0f523510881eac230 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -728,15 +728,5 @@
 #define CURL_ICONV_CODESET_OF_HOST "IBM-1047"
 #endif
 
-/* ---------------------------------------------------------------- */
-/*                          HEADER FILES                            */
-/* ---------------------------------------------------------------- */
-
-#include <strings.h>    /* for bzero, strcasecmp, and strncasecmp */
-#include <string.h>     /* for strcpy and strlen */
-#include <stdlib.h>     /* for rand and srand */
-#include <sys/socket.h> /* for select and ioctl*/
-#include <netdb.h>      /* for in_addr_t definition */
-#include <tpf/sysapi.h> /* for tpf_process_signals */
 
 #endif /* __LIBCONFIGTPF_H */
diff --git a/lib/setup.h b/lib/setup.h
index ba3ddce0c6eb7ce9fdf49a5785af470cfa5dc4f7..e174e18e4069fa2e41f0b67f76554e93c017e3c1 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -173,6 +173,15 @@
 #  include <extra/strdup.h>
 #endif
 
+#ifdef TPF
+#  include <strings.h>    /* for bzero, strcasecmp, and strncasecmp */
+#  include <string.h>     /* for strcpy and strlen */
+#  include <stdlib.h>     /* for rand and srand */
+#  include <sys/socket.h> /* for select and ioctl*/
+#  include <netdb.h>      /* for in_addr_t definition */
+#  include <tpf/sysapi.h> /* for tpf_process_signals */
+#endif
+
 #include <stdio.h>
 #ifdef HAVE_ASSERT_H
 #include <assert.h>