diff --git a/acinclude.m4 b/acinclude.m4
index fae9b81de88fcfefecdeaa4ee2a3a0aeb3c3c3f0..d6fbab5fd9b6d2b5243f246c6752804f8a7071ab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2601,28 +2601,6 @@ fi
 ])
 
 
-AC_DEFUN([CURL_CHECK_INET_NTOA_R],
-[
-  dnl determine if function definition for inet_ntoa_r exists.
-  AC_CHECK_FUNCS(inet_ntoa_r,[
-    AC_MSG_CHECKING(whether inet_ntoa_r is declared)
-    AC_EGREP_CPP(inet_ntoa_r,[
-#undef _REENTRANT
-#include <arpa/inet.h>],[
-      AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])
-      AC_MSG_RESULT(yes)],[
-      AC_MSG_RESULT(no)
-      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)
-      AC_EGREP_CPP(inet_ntoa_r,[
-#undef _REENTRANT
-#define _REENTRANT
-#include <arpa/inet.h>],[
-        AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])
-        AC_MSG_RESULT(yes)],
-        AC_MSG_RESULT(no))])])
-])
-
-
 dnl **********************************************************************
 dnl CURL_DETECT_ICC ([ACTION-IF-YES])
 dnl
diff --git a/ares/Makefile.netware b/ares/Makefile.netware
index 491a22f9aa00cdbb497463db05eac97871735091..854de9c0344fdbbc4fb5585377e5d66e99b8d274 100644
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -357,7 +357,6 @@ endif
 	@echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@
 	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
-	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@
 	@echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
diff --git a/configure.ac b/configure.ac
index 6d4d69347d975f03a673ffdc463703022fc55b6f..67289e678145d5740cbbcea4ce50f47a8dc64b7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1881,7 +1881,7 @@ else
   dnl fi
 
   dnl poke around for inet_ntoa_r()
-  CURL_CHECK_INET_NTOA_R()
+  dnl the old inet_ntoa_r check was done here
 
   dnl is there a localtime_r()
   dnl the old localtime_r check was done here
@@ -2116,7 +2116,6 @@ AC_CHECK_FUNCS([basename \
   getrlimit \
   gettimeofday \
   inet_addr \
-  inet_ntoa \
   inet_pton \
   perror \
   pipe \
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 8cb9a7425ee329651bef8abeb6914b8f90a448d8..7be6ccf913001018b082584220d62c32caf9cda1 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -14,7 +14,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
 HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\
   progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
   if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\
-  getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h	\
+  getinfo.h strequal.h krb4.h memdebug.h http_chunks.h	                \
   strtok.h connect.h llist.h hash.h content_encoding.h share.h		\
   curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h	\
   strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h		\
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 5e3e861bbb4b2506c66cec1d34f9dee0022facbe..a2aa1623f07d2d0bebcba3b8d5f2a4afba020fdb 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -457,7 +457,6 @@ endif
 	@echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@
 	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
-	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@
diff --git a/lib/amigaos.h b/lib/amigaos.h
index ed3baf50e993558d2e0820bcdfd2ca4200d6e332..649c05f2e93b82e9cf5f0dee1a3038668a0bfb7f 100644
--- a/lib/amigaos.h
+++ b/lib/amigaos.h
@@ -40,9 +40,6 @@
 #ifndef select
 # define select(args...) WaitSelect( args, NULL)
 #endif
-#ifndef inet_ntoa
-# define inet_ntoa(x)    Inet_NtoA( x ## .s_addr)
-#endif
 #ifndef ioctl
 # define ioctl(a,b,c,d)  IoctlSocket( (LONG)a, (ULONG)b, (char*)c)
 #endif
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 86d9daa41b683dfbdc649e6b73053fede8a056c3..f8dc3a374564a54d2faf071faccdeb3883a9bf9d 100644
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -28,7 +28,6 @@
 #define HAVE_ARPA_INET_H 1
 #define HAVE_GETHOSTBYADDR 1
 #define HAVE_INET_ADDR 1
-#define HAVE_INET_NTOA 1
 #define HAVE_INTTYPES_H 1
 #define HAVE_IOCTLSOCKET_CASE 1
 #define HAVE_LIBCRYPTO 1
diff --git a/lib/config-mac.h b/lib/config-mac.h
index c08a302aa135fc227c3a29af2a63954f60a461e5..2f4c2fb02e6e3237cb6a2020d9ad4d548bea2b0e 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -31,7 +31,6 @@
 #define HAVE_ALARM              1
 #define HAVE_STRDUP             1
 #define HAVE_UTIME              1
-#define HAVE_INET_NTOA          1
 #define HAVE_SETVBUF            1
 #define HAVE_STRFTIME           1
 #define HAVE_INET_ADDR          1
diff --git a/lib/config-os400.h b/lib/config-os400.h
index f49a159c90e3cf42d177cdf2a4b87232ed968d17..647893d9930505b08618d4e5cd92a42a6e857555 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -33,12 +33,6 @@
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 
-/* Define if you have the inet_ntoa_r function declared. */
-#define HAVE_INET_NTOA_R_DECL
-
-/* Define if the inet_ntoa_r function returns an int. */
-#define HAVE_INT_INET_NTOA_R
-
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 
@@ -127,12 +121,6 @@
 /* Define if you have the `inet_addr' function. */
 #define HAVE_INET_ADDR
 
-/* Define if you have the `inet_ntoa' function. */
-#define HAVE_INET_NTOA
-
-/* Define if you have the `inet_ntoa_r' function. */
-#define HAVE_INET_NTOA_R
-
 /* Define if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H
 
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index e3a1c15fc7926b55c166588b15fddee8da4a80c5..f863f634e5b3c38d2169812af899d46040457063 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -29,9 +29,6 @@
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 
-/* Define if you have the inet_ntoa_r function declared. */
-#undef HAVE_INET_NTOA_R_DECL
-
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 
@@ -122,12 +119,6 @@
 /* Define if you have the `inet_addr' function. */
 #undef HAVE_INET_ADDR
 
-/* Define if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
-
-/* Define if you have the `inet_ntoa_r' function. */
-#undef HAVE_INET_NTOA_R
-
 /* Define if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H
 
diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index 1bd34a298ce24a9b388bc5d56690965dbadaf8f1..3f0ddf15820c39e4d6ab5e2e06f9e780b5704546 100644
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -222,15 +222,6 @@
 /* Define to 1 if you have the `inet_addr' function. */
 /*#define HAVE_INET_ADDR 1*/
 
-/* Define to 1 if you have the `inet_ntoa' function. */
-/*#define HAVE_INET_NTOA 1*/
-
-/* Define to 1 if you have the `inet_ntoa_r' function. */
-/* #undef HAVE_INET_NTOA_R */
-
-/* inet_ntoa_r() is declared */
-/* #undef HAVE_INET_NTOA_R_DECL */
-
 /* Define to 1 if you have the `inet_pton' function. */
 #define HAVE_INET_PTON 1
 
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index ff441e59e6d6f3c3f7c73568b6d50f65b2b2f3cb..35231976a527aab2461f55dfa561ff85714a19b6 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -208,15 +208,6 @@
 /* Define to 1 if you have the `inet_addr' function. */
 #define HAVE_INET_ADDR 1
 
-/* Define to 1 if you have the `inet_ntoa' function. */
-#define HAVE_INET_NTOA 1
-
-/* Define to 1 if you have the `inet_ntoa_r' function. */
-/* #undef HAVE_INET_NTOA_R */
-
-/* inet_ntoa_r() is declared */
-/* #undef HAVE_INET_NTOA_R_DECL */
-
 /* Define to 1 if you have the `inet_pton' function. */
 /* #undef HAVE_INET_PTON */
 
diff --git a/lib/config-win32.h b/lib/config-win32.h
index c987f41ca229580ef80e0220342b2865597c0572..0d10a04bb0c9a8dff21bc3ce487da8a0495704be 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -157,9 +157,6 @@
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
-/* Define if you have the inet_ntoa function.  */
-#define HAVE_INET_NTOA 1
-
 /* Define if you have the ioctlsocket function.  */
 #define HAVE_IOCTLSOCKET 1
 
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 84a5678836ade7b8b3240a7c6580f4e8ab1e378f..b770a4472bc79566b374864807aa38cf91dbf00c 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -145,9 +145,6 @@
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
-/* Define if you have the inet_ntoa function.  */
-#define HAVE_INET_NTOA 1
-
 /* Define if you have the ioctlsocket function.  */
 #define HAVE_IOCTLSOCKET 1
 
diff --git a/lib/formdata.c b/lib/formdata.c
index e017cb7f31f5cd80ff8fbfe0270b46fff298b5e3..62409ec413b63dfe7cef3c7dfbd8740b768b3301 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -56,14 +56,14 @@ Content-Type: application/octet-stream
 vlue for PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE
 (or you might see v^@lue at the start)
 
-Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="inet_ntoa_r.h"
+Content-Disposition: form-data; name="FILE1_+_CONTENTTYPE"; filename="formdata.h"
 Content-Type: text/html
 ...
 
 Content-Disposition: form-data; name="FILE1_+_FILE2"
 Content-Type: multipart/mixed, boundary=curlz1s0dkticx49MV1KGcYP5cvfSsz
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 Content-Disposition: attachment; filename="Makefile.b32"
@@ -73,13 +73,13 @@ Content-Type: application/octet-stream
 Content-Disposition: form-data; name="FILE1_+_FILE2_+_FILE3"
 Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 Content-Disposition: attachment; filename="Makefile.b32"
 Content-Type: application/octet-stream
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 
@@ -87,13 +87,13 @@ Content-Type: application/octet-stream
 Content-Disposition: form-data; name="ARRAY: FILE1_+_FILE2_+_FILE3"
 Content-Type: multipart/mixed, boundary=curlirkYPmPwu6FrJ1vJ1u1BmtIufh1
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 Content-Disposition: attachment; filename="Makefile.b32"
 Content-Type: application/octet-stream
 ...
-Content-Disposition: attachment; filename="inet_ntoa_r.h"
+Content-Disposition: attachment; filename="formdata.h"
 Content-Type: application/octet-stream
 ...
 
@@ -1562,7 +1562,7 @@ int main(int argc, argv_item_t argv[])
   char value4[] = "value for simple PTRCONTENTS";
   char value5[] = "value for PTRCONTENTS + CONTENTSLENGTH";
   char value6[] = "value for PTRCONTENTS + CONTENTSLENGTH + CONTENTTYPE";
-  char value7[] = "inet_ntoa_r.h";
+  char value7[] = "formdata.h";
   char value8[] = "Makefile.b32";
   char type2[] = "image/gif";
   char type6[] = "text/plain";
diff --git a/lib/ftp.c b/lib/ftp.c
index 4021c500b32b56969e64d92b7e29396915c02dd9..7f1e51205915ff0ab0f38fca3a88fe16c92e63e3 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -84,7 +84,6 @@
 #include "sslgen.h"
 #include "connect.h"
 #include "strerror.h"
-#include "memory.h"
 #include "inet_ntop.h"
 #include "select.h"
 #include "parsedate.h" /* for the week day and month names */
@@ -92,17 +91,12 @@
 #include "multiif.h"
 #include "url.h"
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
+#include "memory.h"
 /* The last #include file should be: */
-#ifdef CURLDEBUG
 #include "memdebug.h"
-#endif
 
 #ifdef HAVE_NI_WITHSCOPEID
 #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID
diff --git a/lib/hostares.c b/lib/hostares.c
index e283bbffc4d65e57282d91d5618d609f98b872cd..2936345735f39c6454df04d9ff1c4074675391e0 100644
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -80,12 +80,7 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
-
 /* The last #include file should be: */
 #include "memdebug.h"
 
diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index b7fff89393c0ef723eba60df3a4809535dacdb15..bcf8a54001c669c2d2201648bb141dbb5a37d174 100644
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -71,10 +71,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostip.c b/lib/hostip.c
index f223889dd58dc4089c1d40d92f246a53e9981bad..722c4b5259532fe9fb56e3823c6900502bcaa700 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -72,10 +72,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostip4.c b/lib/hostip4.c
index a7d94c87af22e6be8ba1aaf7e154a6df0894aefc..392e40b207e4ab26e8e1463546308dea2ee3c047 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -73,10 +73,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 0d63f72247db5e4122b2690db63fc3ffae72910f..2f9857f43c107d9cdd68e16f3f9ee7a0782c1399 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -73,10 +73,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index 83d062e6d433b198738f618527b6f730401e969c..650906b9ca7bb7bd223cd1c1cf338ddc0322fc53 100644
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -71,10 +71,6 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/inet_ntoa_r.h b/lib/inet_ntoa_r.h
deleted file mode 100644
index c6c9bd89593c7576dba5afc3c5c9753ca039369c..0000000000000000000000000000000000000000
--- a/lib/inet_ntoa_r.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __INET_NTOA_R_H
-#define __INET_NTOA_R_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2005, 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
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-
-#include "setup.h"
-
-#ifdef HAVE_INET_NTOA_R_2_ARGS
-/*
- * uClibc 0.9.26 (at least) doesn't define this prototype. The buffer
- * must be at least 16 characters long.
- */
-char *inet_ntoa_r(const struct in_addr in, char buffer[]);
-
-#else
-/*
- * My solaris 5.6 system running gcc 2.8.1 does *not* have this prototype
- * in any system include file! Isn't that weird?
- */
-char *inet_ntoa_r(const struct in_addr in, char *buffer, int buflen);
-
-#endif
-
-#endif
diff --git a/lib/setup-os400.h b/lib/setup-os400.h
index bf899759e5627d1884110435e0814b508a46fae5..5efa6863b7f01ccbe98e9127c653519dc470ab7f 100644
--- a/lib/setup-os400.h
+++ b/lib/setup-os400.h
@@ -59,12 +59,6 @@ extern int      Curl_getnameinfo_a(const struct sockaddr * sa, socklen_t salen,
 
 /* SSL wrappers. */
 
-extern int      Curl_inet_ntoa_r_a(struct in_addr internet_address,
-                                   char * output_buffer,
-                                   int output_buffer_length);
-#define inet_ntoa_r             Curl_inet_ntoa_r_a
-
-
 extern int      Curl_SSL_Init_Application_a(SSLInitApp * init_app);
 #define SSL_Init_Application    Curl_SSL_Init_Application_a
 
diff --git a/lib/setup.h b/lib/setup.h
index df253662f65212824feb4966844f9505044d4899..66ddd38cbe30e8b89a92b350f31fd9991202943b 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -455,10 +455,6 @@ int netware_init(void);
 
 #define LIBIDN_REQUIRED_VERSION "0.4.1"
 
-#ifdef __UCLIBC__
-#define HAVE_INET_NTOA_R_2_ARGS 1
-#endif
-
 #if defined(USE_GNUTLS) || defined(USE_SSLEAY) || defined(USE_NSS) || defined(USE_QSOSSL)
 #define USE_SSL    /* SSL support has been enabled */
 #endif
diff --git a/lib/ssh.c b/lib/ssh.c
index 17efff13b7cc52e6a51eb497858c74943e981416..b968dcf3625cb941751be43764a7229421ae6e85 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -98,23 +98,17 @@
 #include "sslgen.h"
 #include "connect.h"
 #include "strerror.h"
-#include "memory.h"
 #include "inet_ntop.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "multiif.h"
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
+#include "memory.h"
 /* The last #include file should be: */
-#ifdef CURLDEBUG
 #include "memdebug.h"
-#endif
 
 #ifndef PATH_MAX
 #define PATH_MAX 1024 /* just an extra precaution since there are systems that
diff --git a/lib/url.c b/lib/url.c
index 352ec20c716ab3d2f5b1a8b47e900ae9baee695b..53e2bf7e040ebb9aafe1ea4a96c5a0efc16ec65d 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -138,15 +138,10 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by
 #include "http_ntlm.h"
 #include "socks.h"
 
-#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
-#include "inet_ntoa_r.h"
-#endif
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "memory.h"
-
 /* The last #include file should be: */
 #include "memdebug.h"
 
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 4a63e0891b3b7a8b69add8cf3168da23719ff5a4..73e13fda089c48bd54a0cf621eeef62ac1fab52b 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -340,37 +340,6 @@ Curl_getaddrinfo_a(const char * nodename, const char * servname,
 }
 
 
-int
-Curl_inet_ntoa_r_a(struct in_addr internet_address,
-                   char * output_buffer, int output_buffer_length)
-
-{
-  int rc;
-  int i;
-  char * cp;
-
-  if (!output_buffer || output_buffer_length < 16)
-    return inet_ntoa_r(internet_address, output_buffer, output_buffer_length);
-
-  if (!(cp = malloc(output_buffer_length + 1)))
-    return -1;
-
-  rc = inet_ntoa_r(internet_address, cp, output_buffer_length);
-
-  if (rc) {
-    free(cp);
-    return rc;
-    }
-
-  cp[output_buffer_length - 1] = '\0';
-  i = strlen(cp);
-  QadrtConvertE2A(output_buffer, cp, i, i);
-  output_buffer[i] = '\0';
-  free(cp);
-  return rc;
-}
-
-
 #ifdef USE_QSOSSL
 
 /* ASCII wrappers for the SSL procedures. */
diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h
index f385767135c8abe47bb3e22963475be3cfde2919..302915414be686199a552e583e3e97e753efa83c 100644
--- a/packages/vms/config-vms.h
+++ b/packages/vms/config-vms.h
@@ -62,9 +62,6 @@
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
-/* Define if you have the inet_ntoa function.  */
-#define HAVE_INET_NTOA 1
-
 /* Define if you have the perror function.  */
 #define HAVE_PERROR 1
 
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 671ff0c31945f86d23ab9e937ac4b9a25c5eba89..0defac8fd06fe782e43304de8be0dac634df8b33 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -445,7 +445,6 @@ endif
 	@echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@
 	@echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
-	@echo $(DL)#define HAVE_INET_NTOA 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@
diff --git a/src/config-riscos.h b/src/config-riscos.h
index 544b249e8497e5658dfab3ed10b45552e3b8d364..bb27a0d0214b019edc6b6e07792270d9990f3871 100644
--- a/src/config-riscos.h
+++ b/src/config-riscos.h
@@ -32,9 +32,6 @@
 /* Define if you have the gethostbyname_r() function with 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 
-/* Define if you have the inet_ntoa_r function declared. */
-#undef HAVE_INET_NTOA_R_DECL
-
 /* Define if you need the _REENTRANT define for some functions */
 #undef NEED_REENTRANT
 
@@ -125,12 +122,6 @@
 /* Define if you have the `inet_addr' function. */
 #undef HAVE_INET_ADDR
 
-/* Define if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
-
-/* Define if you have the `inet_ntoa_r' function. */
-#undef HAVE_INET_NTOA_R
-
 /* Define if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H