diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 4165a451d67c2fd60dfb7a3c257f118035a52df5..7f3bdf8a2ebbd866e9cac42b41410f44652fca7e 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -39,16 +37,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_PROCESS_H
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index 0fcbc49ae9d94ab1c3f5865ce954bbce17f598dc..d2a6dde496e90104c247b3c7bd6b888af656fa72 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -36,16 +34,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #if defined(USE_THREADS_POSIX)
diff --git a/lib/axtls.c b/lib/axtls.c
index 990264b93696578848fb4294af8a02da2c20c7cd..e37aed50ae00316fa91bc7e0f469628f5f8bb430 100644
--- a/lib/axtls.c
+++ b/lib/axtls.c
@@ -27,13 +27,11 @@
  */
 
 #include "setup.h"
+
 #ifdef USE_AXTLS
 #include <axTLS/ssl.h>
 #include "axtls.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/base64.c b/lib/base64.c
index 0de1f01005fee465472224037c22b728955cd3bd..812fd67c2754e3aaa4f5d72dbe60f667f520ff57 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -24,9 +24,6 @@
 
 #include "setup.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
diff --git a/lib/connect.c b/lib/connect.c
index adfdd712dc3bc1ca0f67f73e078c1edc6e716811..1f802bda84c85763b705e284a3a8db4490d765a7 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -49,9 +49,6 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE))
 #include <sys/filio.h>
@@ -65,9 +62,6 @@
 #include <inet.h>
 #endif
 
-#include <stdio.h>
-#include <string.h>
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 876115a326de7bb0082605ab07a35289350c4a2d..63bc2433c4e4276724950f8e25be16f763fc8e1a 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -24,9 +24,6 @@
 
 #ifdef HAVE_LIBZ
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "urldata.h"
 #include <curl/curl.h>
 #include "sendf.h"
diff --git a/lib/cookie.c b/lib/cookie.c
index 7657da06e0c24f22a5b8dcaefbb63acd4d0e2a40..86d264c45b9d9ad0e65c9cc9eaa68c75f619f404 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -81,9 +81,6 @@ Example set of cookies:
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
 
-#include <stdlib.h>
-#include <string.h>
-
 #define _MPRINTF_REPLACE
 #include <curl/mprintf.h>
 
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 074bf17dc6dd98b1c4777f46f6f7fd412835217e..bae403f95e45d5d0833da51090e5127a78bd9eef 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -40,7 +40,6 @@
 #ifdef __VMS
 #  include <in.h>
 #  include <inet.h>
-#  include <stdlib.h>
 #endif
 
 #if defined(NETWARE) && defined(__NOVELL_LIBC__)
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index e9636440fbcab8d06e89ffe86eb1ce8833d3546e..411ccc81d175182fbdee74712c70e705334ba418 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -19,6 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 #if defined(USE_THREADS_POSIX)
diff --git a/lib/cyassl.c b/lib/cyassl.c
index 81bcabaa13343f4de3b591fe2eed168af9bb7ee0..6f15b8ebd406da14daab262aceff54bce23e1689 100644
--- a/lib/cyassl.c
+++ b/lib/cyassl.c
@@ -27,16 +27,13 @@
  */
 
 #include "setup.h"
+
 #ifdef USE_CYASSL
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 
-
 #include "urldata.h"
 #include "sendf.h"
 #include "inet_pton.h"
diff --git a/lib/dict.c b/lib/dict.c
index 241781ab924f1255104ff204654c2daf8949fb88..36bb28923473106ef44aee0e2d46e6d82a22ccf6 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -24,13 +24,6 @@
 
 #ifndef CURL_DISABLE_DICT
 
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/easy.c b/lib/easy.c
index 30daf15854f62a0ec3d7d311b4ad441dbbe5f86a..76ff702e3e81127143a50af861c20b377d0c3fac 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -22,13 +22,6 @@
 
 #include "setup.h"
 
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/escape.c b/lib/escape.c
index 5500a92bfacbb18017acb6ef0f6a9435994b9446..b0922bc936840aa45d6ef87f5920e978c716436b 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -24,12 +24,9 @@
  * allocated string or NULL if an error occurred.  */
 
 #include "setup.h"
-#include <ctype.h>
+
 #include <curl/curl.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "curl_memory.h"
 #include "urldata.h"
 #include "warnless.h"
diff --git a/lib/file.c b/lib/file.c
index c29b0c9f81400e83c24722ab18fa71a9cdbf7038..610a3495b8441be2fdd18e681ed25d12266d3351 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -23,12 +23,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_FILE
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/lib/fileinfo.c b/lib/fileinfo.c
index dbae7da516675506dc80dc3df1f4adc4f2d4e496..16166687e6991353992bd124cfbdd0f97765d03e 100644
--- a/lib/fileinfo.c
+++ b/lib/fileinfo.c
@@ -22,7 +22,6 @@
 
 #include "setup.h"
 
-#include <stdlib.h>
 #include "strdup.h"
 #include "fileinfo.h"
 
diff --git a/lib/formdata.c b/lib/formdata.c
index e6ab124aab88853cb4fecd5707211670e2668026..9e3ed08e5812567c64338ab6a5c9516421be79b8 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -21,6 +21,7 @@
  ***************************************************************************/
 
 #include "setup.h"
+
 #include <curl/curl.h>
 
 /* Length of the random boundary string. */
@@ -28,10 +29,6 @@
 
 #if !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
 #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
 #include <libgen.h>
 #endif
diff --git a/lib/ftp.c b/lib/ftp.c
index bfc0a78a1c755c65d95f8a31cb391f96b1d1d17c..c30d809b01fb0ceaafb8678ef3cb4ef149ed2bd0 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -23,11 +23,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/getenv.c b/lib/getenv.c
index 36fbb75832efaa3de9a3c4b325369880310b5756..6b40dd68dd0df08796a228503767b41369b6e0b6 100644
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -22,10 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef __VMS
 #include <unixlib.h>
 #endif
diff --git a/lib/getinfo.c b/lib/getinfo.c
index bb289741a70f05cb4ef87402ed3dfee06e5bacd2..aa7af2c86e38fd471e221bd889b40ee59f6d02a6 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -27,10 +27,6 @@
 #include "urldata.h"
 #include "getinfo.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #include "curl_memory.h"
 #include "sslgen.h"
 #include "connect.h" /* Curl_getconnectinfo() */
diff --git a/lib/gopher.c b/lib/gopher.c
index dc9c134b5acd286e1cc24f8810caa11396d2df90..38f1f64a9005fcce354bd1448903e2651a01378e 100644
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -24,13 +24,6 @@
 
 #ifndef CURL_DISABLE_GOPHER
 
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/gtls.c b/lib/gtls.c
index a376fb0b96bbfe36c2cae38cd7dcc1b6e199e402..f75a815766cabe2f17b77683cad0605f0dcd5994 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -29,14 +29,13 @@
  */
 
 #include "setup.h"
+
 #ifdef USE_GNUTLS
+
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gcrypt.h>
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/hash.c b/lib/hash.c
index 6c921e4427ad617fbaee074e22f1abb6749cd824..3a6e312a3b277bb55e8a186c36bf047b76059842 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 #include "hash.h"
 #include "llist.h"
 
diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index 50f6b01fbca35995d1e156782ef0adc0eab40f04..771562fd15ed5418cb1e817c3e6dc260b0956256 100644
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -36,16 +34,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_PROCESS_H
diff --git a/lib/hostip.c b/lib/hostip.c
index 084ee86acafa5c201abf946f5533e608e2f68acc..e857dced4ac06054e1d24db202541fb3ee217ae4 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -36,16 +34,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_SETJMP_H
diff --git a/lib/hostip4.c b/lib/hostip4.c
index 5d85198184811b6c4744a52861f90f737b8958e7..1a5e26585dae9500a2448a362b93d376e4ff6686 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -36,16 +34,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_PROCESS_H
diff --git a/lib/hostip6.c b/lib/hostip6.c
index b944401c59686afb5176822b46bac4e7560bf575..dae41e97f5b60c9f5ed46532dba7818ea027b93b 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -36,16 +34,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_PROCESS_H
diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index a5e97658e49be705a105b6d70eefef8731c41879..b601887087835b7a4de50987671edb6b5a6562ab 100644
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -22,8 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -36,16 +34,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>     /* required for free() prototypes */
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>     /* for the close() proto */
 #endif
 #ifdef __VMS
 #include <in.h>
 #include <inet.h>
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_PROCESS_H
diff --git a/lib/http.c b/lib/http.c
index be0149cb92f78fde5a07743f3c6a920f070fa18e..bb4b3879346e3055335dece4e7126af6465884a3 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -23,12 +23,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_HTTP
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 93de1d9688ed7fa6133a7d223db0276a7e5da6a6..d7a5cb48c9e9c4dfddb950792b89c5c844651b09 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -19,15 +19,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 #ifndef CURL_DISABLE_HTTP
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #include "urldata.h" /* it includes http_chunks.h */
 #include "sendf.h"   /* for the client write stuff */
diff --git a/lib/http_digest.c b/lib/http_digest.c
index c3a39fcee422520d35a02378b698ca8dd771b37d..3ca0389e9bc91bc407d21569c6975226532e697c 100644
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -19,15 +19,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #include "urldata.h"
 #include "sendf.h"
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 36823f8cfab5efc2258945873c2480cbe4e9e49c..d7bc67955b2203b732e611324346449da71d78c4 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -19,6 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 #ifdef HAVE_GSSAPI
@@ -27,12 +28,6 @@
 #endif
 
 #ifndef CURL_DISABLE_HTTP
- /* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #include "urldata.h"
 #include "sendf.h"
diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c
index 0f40bb584828ee1c256eef0d339fc11776cab89b..10eca697c31dc03da391030f4a5d3b4d9180af15 100644
--- a/lib/http_negotiate_sspi.c
+++ b/lib/http_negotiate_sspi.c
@@ -19,17 +19,12 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
 #ifndef CURL_DISABLE_HTTP
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #include "urldata.h"
 #include "sendf.h"
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 166d169c9fe1568a987dd39f9ed1ec57fd10eb71..dfd243030922ee771cb404d06afbe69f5574de5c 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -19,6 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 /* NTLM details:
@@ -32,20 +33,12 @@
 
 #define DEBUG_ME 0
 
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #ifdef USE_NTLM_SSO
 #include <unistd.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 9fa832e4d0b0cf715c217ead71aed6b172a62126..f3b02c975e3babd6e46f10374288b75d9e609229 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -27,6 +27,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
 #include "urldata.h"
 #include <curl/curl.h>
 #include "http_proxy.h"
diff --git a/lib/idn_win32.c b/lib/idn_win32.c
index 96d3f0959faa9af6fb9ef56fd9b4619295901948..70286c0fd489d8c2cf6d97f2471b134397cb86d4 100644
--- a/lib/idn_win32.c
+++ b/lib/idn_win32.c
@@ -19,13 +19,15 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-/***************************************************************************
- * IDN Implementation using windows native APIs
- * Pierre Joye <pierre@php.net>
- ***************************************************************************/
-#if defined(WIN32) && defined(USE_WIN32_IDN)
-#include <windows.h>
-#include <stdio.h>
+
+ /*
+  * IDN conversions using Windows kernel32 and normaliz libraries.
+  */
+
+#include "setup.h"
+
+#ifdef USE_WIN32_IDN
+
 #include <tchar.h>
 
 #ifdef WANT_IDN_PROTOTYPES
@@ -121,7 +123,5 @@ int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8)
   }
   return 1;
 }
-#else
-typedef int dummy; /* because ISO C forbids an empty translation unit! */
-#endif
- /* WIN32 */
+
+#endif /* USE_WIN32_IDN */
diff --git a/lib/imap.c b/lib/imap.c
index b135443d31f0b0ab2719e7d31ba2b2c95361843c..f414ee7bbf3c5e2cf6054ac36538fa70edf5d709 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -26,11 +26,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_IMAP
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index bb175b41734d0654b4a639ad38804fdef3a874bd..1bb97443b24e95c85b40310e23095fec4e5e700f 100644
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -34,7 +34,6 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#include <string.h>
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index 5a781abf5f49a447bd3c8629beac31304ee9a8d1..021f48d52cee89ebf258539e426f7d8ae445bcd9 100644
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -32,7 +32,6 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#include <string.h>
 
 #include "inet_pton.h"
 
diff --git a/lib/krb4.c b/lib/krb4.c
index 0915b0248418a209f2b724daf9e3c12b74a6db00..30b1c664edf90b923c16b83adff0529cb2a9b14b 100644
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -44,11 +44,9 @@
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_KRB4
 
-#include <stdlib.h>
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
-#include <string.h>
 #include <krb.h>
 #include <des.h>
 
diff --git a/lib/krb5.c b/lib/krb5.c
index 5c60c8dc4245596ff032259e6eb51d5a8fde6039..c29f95be0155bf698c89bbf853ea6f76988dee43 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -41,11 +41,9 @@
 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
 #endif
 
-#include <stdlib.h>
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
-#include <string.h>
 
 #include "urldata.h"
 #include "curl_base64.h"
diff --git a/lib/ldap.c b/lib/ldap.c
index ccdd83e6b9b2ee8c25dc792a39eab91986ee262d..9692ed9d72a4f6b69d8103fd721e0232997b7704 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -35,13 +35,6 @@
  * OpenLDAP library versions, USE_OPENLDAP shall not be defined.
  */
 
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #ifdef CURL_LDAP_WIN            /* Use Windows LDAP implementation. */
 # include <winldap.h>
 # ifndef LDAP_VENDOR_NAME
diff --git a/lib/llist.c b/lib/llist.c
index 8b4bc7f2009876fecd4dbf4264f87422dc4cc14d..9ad1db59bbf374245a119d71e33046fc57d64ccc 100644
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 #include "llist.h"
 #include "curl_memory.h"
 
diff --git a/lib/md4.c b/lib/md4.c
index 84c520210257ed1d882aa576c4401d52e79a9b7d..828ce6277c29f3d9de5939b8b768641c6201276b 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -27,7 +27,6 @@
 #ifdef USE_NSS
 
 #include "curl_md4.h"
-#include <string.h>
 
 typedef unsigned int UINT4;
 
diff --git a/lib/md5.c b/lib/md5.c
index 8abcb2b1dd440c5d911157cc8687837ecbf6abcb..f26e0275200763c87f0ff40628d6cd43eb5dca40 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -24,8 +24,6 @@
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 
-#include <string.h>
-
 #include "curl_md5.h"
 #include "curl_hmac.h"
 
diff --git a/lib/memdebug.c b/lib/memdebug.c
index 69e204b6a735f5ffb67da3fc182736b3998573fc..60d938ade2c8734ab1921bcea263e87ea271bbdd 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -32,10 +32,6 @@
 #define _MPRINTF_REPLACE
 #include <curl/mprintf.h>
 #include "urldata.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/memdebug.h b/lib/memdebug.h
index 77a4f477412b84869de899f273f1bbca7dce0e7a..3dc48157738ecdcc42f71a3f9b7f9835f6efa893 100644
--- a/lib/memdebug.h
+++ b/lib/memdebug.h
@@ -1,6 +1,6 @@
 #ifdef CURLDEBUG
-#ifndef _CURL_MEMDEBUG_H
-#define _CURL_MEMDEBUG_H
+#ifndef HEADER_CURL_MEMDEBUG_H
+#define HEADER_CURL_MEMDEBUG_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -39,7 +39,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include <stdio.h>
 
 #define logfile curl_debuglogfile
 
@@ -133,7 +132,7 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source);
 
 #endif /* MEMDEBUG_NODEFINES */
 
-#endif /* _CURL_MEMDEBUG_H */
+#endif /* HEADER_CURL_MEMDEBUG_H */
 #endif /* CURLDEBUG */
 
 #ifndef fake_sclose
diff --git a/lib/mprintf.c b/lib/mprintf.c
index dd7a1e09b218d8d5066abd94fd7d7175352d2100..38732e099e884d646a2c6c7d181e7cf77915a6e8 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -36,11 +36,6 @@
  */
 
 #include "setup.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <string.h>
 
 #if defined(DJGPP) && (DJGPP_MINOR < 4)
 #undef _MPRINTF_REPLACE /* don't use x_was_used() here */
diff --git a/lib/netrc.c b/lib/netrc.c
index 5541a2f29cbd881932ca536da7fd9a0e42e32967..6764b974dc2ff49aea5a7f5f83731c556372d4f4 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -22,10 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/nonblock.c b/lib/nonblock.c
index cd819506cb6025e9affbb1d5551000a5ece3ddda..6b023f8120db66dd79c228ffbf69ddfdf85859aa 100644
--- a/lib/nonblock.c
+++ b/lib/nonblock.c
@@ -34,9 +34,6 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE))
 #include <sys/filio.h>
diff --git a/lib/nss.c b/lib/nss.c
index 3dc0ba61c91655d873ff1dc8cb0e5874066138ab..7f5acbc84efe223f06179157451d3a8ab5137783 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -27,9 +27,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/nwlib.c b/lib/nwlib.c
index f9c8a4298a57f16d119ddfd5936e18ae9f54fe2f..c87ca0d294469f89a65b987f85589b6ec9c9d62a 100644
--- a/lib/nwlib.c
+++ b/lib/nwlib.c
@@ -20,14 +20,12 @@
  *
  ***************************************************************************/
 
-#ifdef NETWARE /* Novell NetWare */
+#include "setup.h"
 
-#include <stdlib.h>
+#ifdef NETWARE /* Novell NetWare */
 
 #ifdef __NOVELL_LIBC__
 /* For native LibC-based NLM we need to register as a real lib. */
-#include <errno.h>
-#include <string.h>
 #include <library.h>
 #include <netware.h>
 #include <screen.h>
diff --git a/lib/nwos.c b/lib/nwos.c
index ac365124fda8b3a98e4a9c46bb9dacd949a1680c..bd695b3f98ed3c065b143d6f1928880d2e264ea1 100644
--- a/lib/nwos.c
+++ b/lib/nwos.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -20,9 +20,9 @@
  *
  ***************************************************************************/
 
-#ifdef NETWARE /* Novell NetWare */
+#include "setup.h"
 
-#include <stdlib.h>
+#ifdef NETWARE /* Novell NetWare */
 
 #ifdef __NOVELL_LIBC__
 /* For native LibC-based NLM we need to do nothing. */
@@ -34,7 +34,6 @@ int netware_init ( void )
 #else /* __NOVELL_LIBC__ */
 
 /* For native CLib-based NLM we need to initialize the LONG namespace. */
-#include <stdio.h>
 #include <nwnspace.h>
 #include <nwthread.h>
 #include <nwadv.h>
@@ -86,10 +85,4 @@ int __deinit_environment ( void )
 
 #endif /* __NOVELL_LIBC__ */
 
-#else /* NETWARE */
-
-#ifdef __POCC__
-#  pragma warn(disable:2024)  /* Disable warning #2024: Empty input file */
-#endif
-
 #endif /* NETWARE */
diff --git a/lib/parsedate.c b/lib/parsedate.c
index 62f1a4181cd5c6d80187420a21458b6812c671f2..ec60e78e7f2d1c14d3b5b864b34da73a3d8854a4 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -72,14 +72,8 @@
   20040911 +0200
 
 */
-#include "setup.h"
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h> /* for strtol() */
-#endif
+#include "setup.h"
 
 #include <curl/curl.h>
 #include "rawstr.h"
diff --git a/lib/pingpong.h b/lib/pingpong.h
index cbbff8f3ee8120fe04315787e7f8eda109b8095a..370fd7a76301ad49cfecf922c725fe7d7453a551 100644
--- a/lib/pingpong.h
+++ b/lib/pingpong.h
@@ -1,5 +1,5 @@
-#ifndef __PINGPONG_H
-#define __PINGPONG_H
+#ifndef HEADER_CURL_PINGPONG_H
+#define HEADER_CURL_PINGPONG_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -22,8 +22,6 @@
  *
  ***************************************************************************/
 
-#include <stdarg.h>
-
 #include "setup.h"
 
 #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_FTP) || \
@@ -144,4 +142,4 @@ CURLcode Curl_pp_disconnect(struct pingpong *pp);
 int Curl_pp_getsock(struct pingpong *pp, curl_socket_t *socks,
                     int numsocks);
 
-#endif /* __PINGPONG_H */
+#endif /* HEADER_CURL_PINGPONG_H */
diff --git a/lib/polarssl.c b/lib/polarssl.c
index 2e70a28d52453407a20ea8c48093632db80bd517..0232044207c12adbaec85d42ec07eb2f498dc756 100644
--- a/lib/polarssl.c
+++ b/lib/polarssl.c
@@ -27,11 +27,9 @@
  */
 
 #include "setup.h"
+
 #ifdef USE_POLARSSL
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/pop3.c b/lib/pop3.c
index dc5a1c2fa2165cd319a56de62921108a811aaa40..30766711c71c6971fad510fdb67df17d31def5bb 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -27,11 +27,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_POP3
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/qssl.c b/lib/qssl.c
index 0e263ccd1c2bb824d73f6a90042747ba869a916b..172df31411239e4afe3a6076def75b5392bdac91 100644
--- a/lib/qssl.c
+++ b/lib/qssl.c
@@ -23,8 +23,9 @@
 #include "setup.h"
 
 #ifdef USE_QSOSSL
+
 #include <qsossl.h>
-#include <string.h>
+
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #endif
diff --git a/lib/security.c b/lib/security.c
index 010a5504e807f1cb0c8e280c7c74ed107a7a99bc..af61f3aed9d771b97a4ab099391a9cc5ea8ac9e9 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -46,9 +46,6 @@
 #ifndef CURL_DISABLE_FTP
 #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
 
-#include <stdarg.h>
-#include <string.h>
-
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/lib/sendf.c b/lib/sendf.c
index 50b194b667650ae7c86da93f09c53ae62ddccd9a..dd031133c033d04d23f375fbead197d776ed3806 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -22,10 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h> /* required for send() & recv() prototypes */
 #endif
@@ -54,7 +50,6 @@
 #define Curl_sec_read(a,b,c,d) -1
 #endif
 
-#include <string.h>
 #include "curl_memory.h"
 #include "strerror.h"
 
diff --git a/lib/share.c b/lib/share.c
index 33dcecf4c52b67e64fcff9e9b654f2c1b47b6318..a3db4ded9dfd3d55dd3ef99409f7b2ae6ca237c7 100644
--- a/lib/share.c
+++ b/lib/share.c
@@ -21,9 +21,7 @@
  ***************************************************************************/
 
 #include "setup.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+
 #include <curl/curl.h>
 #include "urldata.h"
 #include "share.h"
diff --git a/lib/slist.c b/lib/slist.c
index e2006f4be7ebcd8aa5e8ef1aa22391fa054785bf..8b4bd9d6b66ce7330fc26b66b26b1f9984cafb5a 100644
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -22,11 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include <string.h>
 #include "curl_memory.h"
 #include "slist.h"
 
diff --git a/lib/smtp.c b/lib/smtp.c
index 1626ae7dad054cff66c3b32a0373f59a170fa23b..aab4f80b4de53ce8ddbba1c3cd939b931ecfc0a0 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -29,11 +29,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_SMTP
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/socks.c b/lib/socks.c
index 82293019baf1229e041792caac2b9fd50adcf94d..34de028658fdf8ee08871f5dea291c8941015839 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -23,11 +23,7 @@
 #include "setup.h"
 
 #if !defined(CURL_DISABLE_PROXY) || defined(USE_WINDOWS_SSPI)
-#include <string.h>
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 872efb0e152db86db12ab01381ee72412f3a15e1..de136b037cef4e9088d679235e9105d8a8b60cb2 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -31,11 +31,6 @@
 #ifndef gss_nt_service_name
 #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
 #endif
-#include <string.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #include "curl_gssapi.h"
 #include "urldata.h"
diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 5e1bcba8e1ea92d4fc5b67297933314cc0e94986..5b937621178440888f6775c1e79284b04305df01 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -20,17 +20,10 @@
  *
  ***************************************************************************/
 
-
 #include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <string.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #include "urldata.h"
 #include "sendf.h"
 #include "connect.h"
diff --git a/lib/speedcheck.c b/lib/speedcheck.c
index 56ac34aef4f158b90dfc7f925ef0fd9990f606eb..13d5d233e1e08b1d28698941955fe09da0dcd10b 100644
--- a/lib/speedcheck.c
+++ b/lib/speedcheck.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
diff --git a/lib/ssh.c b/lib/ssh.c
index dff1e128668e8a1ff640ed6af36f6486d38912aa..375093098b52dd2d6afe2aab85d6538a3a6226f0 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -26,11 +26,6 @@
 
 #ifdef USE_LIBSSH2
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #endif
diff --git a/lib/sslgen.c b/lib/sslgen.c
index 779d9e9c313815f2cd488fe0ea3a465410080b0c..fbdbeea9dc82bd839e4db37b3ae3adebc60922b5 100644
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -43,9 +43,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 5bdc536a334339cb192b710345c16f759fe36966..91ed93b2cf598179f7e91cd86482ef5c301b889a 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -32,9 +32,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
diff --git a/lib/strdup.c b/lib/strdup.c
index a3107cff7385b3e251bc5061a64fb2ecc180832e..02d480c262ad68fe0cdde17b798dd0d7e90589e6 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -21,6 +21,7 @@
  ***************************************************************************/
 
 #include "setup.h"
+
 #include "strdup.h"
 
 #ifndef HAVE_STRDUP
diff --git a/lib/strequal.c b/lib/strequal.c
index 15896b9fd2321be950091240cc55e0a3f92f6907..89ad8a6e8defcef8d551569e789fa29734f89278 100644
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <ctype.h>
-
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
diff --git a/lib/strerror.c b/lib/strerror.c
index adee28891194e37c4f708d045f5639163907a6fb..f038f8ec0685bfd4e9192f8bc1fbcfcb8914c6ea 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -34,8 +34,6 @@
 #endif
 
 #include <curl/curl.h>
-#include <stdlib.h>
-#include <string.h>
 
 #ifdef USE_LIBIDN
 #include <idna.h>
diff --git a/lib/strtok.c b/lib/strtok.c
index 91c2541566ab42d8c1e256e372f93e4e35c55a05..94eac0e642c3d61ab4ccca5926da51c4e49838e8 100644
--- a/lib/strtok.c
+++ b/lib/strtok.c
@@ -24,7 +24,6 @@
 
 #ifndef HAVE_STRTOK_R
 #include <stddef.h>
-#include <string.h>
 
 #include "strtok.h"
 
diff --git a/lib/strtoofft.c b/lib/strtoofft.c
index dd897cf1678960a2c5541057de4208b8a06e7bdd..c61459de89f82060f918eac8bce671b507de7f32 100644
--- a/lib/strtoofft.c
+++ b/lib/strtoofft.c
@@ -21,6 +21,7 @@
  ***************************************************************************/
 
 #include "setup.h"
+
 #include "strtoofft.h"
 
 /*
@@ -32,14 +33,11 @@
  */
 
 #ifdef NEED_CURL_STRTOLL
-#include <stdlib.h>
-#include <ctype.h>
 
 /* Range tests can be used for alphanum decoding if characters are consecutive,
    like in ASCII. Else an array is scanned. Determine this condition now. */
 
 #if('9' - '0') != 9 || ('Z' - 'A') != 25 || ('z' - 'a') != 25
-#include <string.h>
 
 #define NO_RANGE_TEST
 
diff --git a/lib/telnet.c b/lib/telnet.c
index 5835e00cb8a529e408d220ea5983bf057d6dae34..91725a06274fb79acfd35cdf9ae1dcdf122bbf23 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -23,12 +23,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_TELNET
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/lib/tftp.c b/lib/tftp.c
index 73ce7aa08f95dd1864960d5a2aa631aaa533578c..f915e76e03f036fcf6af7232b149dde3b20be651 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -23,11 +23,6 @@
 #include "setup.h"
 
 #ifndef CURL_DISABLE_TFTP
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/lib/transfer.c b/lib/transfer.c
index 718507e1b8ca5e20f57e6ee0c63a503d5c07d2d9..637fe7a486e87f07becd580843b321603b9132ad 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -22,13 +22,6 @@
 
 #include "setup.h"
 
-/* -- WIN32 approved -- */
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #include "strtoofft.h"
 #include "strequal.h"
 #include "rawstr.h"
diff --git a/lib/url.c b/lib/url.c
index 39e9bab5da58a6e63a6a876b8983272403f27f00..aa1e6f8cba637b8cfda54536d4107750e24d28b8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -20,16 +20,8 @@
  *
  ***************************************************************************/
 
-/* -- WIN32 approved -- */
-
 #include "setup.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/lib/url.h b/lib/url.h
index 8a5434cef4f90ca7c9accde29d95c544c79680ee..677e639543666c0cda02ab24670d14f507383e1f 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -1,5 +1,5 @@
-#ifndef __URL_H
-#define __URL_H
+#ifndef HEADER_CURL_URL_H
+#define HEADER_CURL_URL_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -22,8 +22,6 @@
  *
  ***************************************************************************/
 
-#include <stdarg.h> /* to make sure we have ap_list */
-
 /*
  * Prototypes for library-wide functions provided by url.c
  */
@@ -94,4 +92,4 @@ void Curl_verboseconnect(struct connectdata *conn);
 #endif
 
 
-#endif
+#endif /* HEADER_CURL_URL_H */
diff --git a/lib/version.c b/lib/version.c
index 6b9ff50705f9f13042aa155618fc5ea602b3682b..f9ee479c8f291f4f22678b9230cb3bf9fff0cd91 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#include <string.h>
-#include <stdio.h>
-
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sslgen.h"
diff --git a/lib/wildcard.c b/lib/wildcard.c
index 9fe5d51355d4d3f96374496c914bdd01c013ce0e..6f4c7380c4aa430c66d8c69dfd536b9d504386b4 100644
--- a/lib/wildcard.c
+++ b/lib/wildcard.c
@@ -21,6 +21,7 @@
  ***************************************************************************/
 
 #include "setup.h"
+
 #include "wildcard.h"
 #include "llist.h"
 #include "fileinfo.h"
diff --git a/src/getpass.c b/src/getpass.c
index 95d257b2fd443e5775b70be2fc9d066c2aeee242..438fc8d3186025e6c93615c1ee0f383e9922eaa1 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -28,9 +28,6 @@
 #ifndef HAVE_GETPASS_R
 /* this file is only for systems without getpass_r() */
 
-#include <stdio.h>
-#include <string.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/src/homedir.c b/src/homedir.c
index 52f69c7ee9617cca53ce54c9fa6c69dfd408163f..d354ef906c4e6d6c4cb131a4204849b531c8e728 100644
--- a/src/homedir.c
+++ b/src/homedir.c
@@ -22,10 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/src/hugehelp.c.cvs b/src/hugehelp.c.cvs
index ac9f0ff87ee438abf487763573bd71cae2a507e5..1eb2fa537a6dbc10f313538445202b9633a2b46e 100644
--- a/src/hugehelp.c.cvs
+++ b/src/hugehelp.c.cvs
@@ -1,4 +1,5 @@
-#include <stdio.h>
+#include "setup.h"
+#include "hugehelp.h"
 void hugehelp(void)
 {
   puts ( "This is a silly replacement for the actual file.");
diff --git a/src/main.c b/src/main.c
index db4405c4af5724bda0637f4eebd638c28c19ba9e..d5a99f733db64bad97134c846fa12ee059624d1d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+
 #include "setup.h"
 
 #include <curl/curl.h>
@@ -27,13 +28,8 @@
 ** system headers
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ctype.h>
 
 #if defined(MSDOS) || defined(WIN32)
 #  if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 4d44a9e0f34dd5d30e5b439696b065c003abcc96..1d1be601eaef663466f0329843532b37b39d7029 100644
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -136,12 +136,10 @@ print <<HEAD
 #include "setup.h"
 #ifdef USE_MANUAL
 #include "hugehelp.h"
-#include <stdio.h>
 HEAD
     ;
 if($c) {
     print <<HEAD
-#include <stdlib.h>
 #include <zlib.h>
 static const unsigned char hugehelpgz[] = {
   /* This mumbo-jumbo is the huge help text compressed with gzip.
diff --git a/src/urlglob.c b/src/urlglob.c
index 8dd77e136aedf5d535f98942a11c7e3bd887431d..371c314f2eb5e608e7ed74678de591dd29a736ca 100644
--- a/src/urlglob.c
+++ b/src/urlglob.c
@@ -23,10 +23,6 @@
 /* client-local setup.h */
 #include "setup.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include <curl/curl.h>
 
 #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
diff --git a/src/writeout.c b/src/writeout.c
index e044a9d8e74cc6f7cee15b66d57bbef7d0e13621..c0f3f382e48f686ec017ed77afd87f918507bd22 100644
--- a/src/writeout.c
+++ b/src/writeout.c
@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/src/xattr.c b/src/xattr.c
index 61d6697bbc3853c65c00cd5ae66f51968045c52b..1600d88c6e58ed40cb8f615f00725d380f8bed83 100644
--- a/src/xattr.c
+++ b/src/xattr.c
@@ -27,7 +27,6 @@
 
 #ifdef HAVE_FSETXATTR
 #include <sys/types.h>
-#include <string.h>
 #include <sys/xattr.h> /* include header from libc, not from libattr */
 
 /* mapping table of curl metadata to extended attribute names */