diff --git a/Makefile.inc b/Makefile.inc
index ced51b2..6a6363c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -204,12 +204,8 @@ PDFPAGES = ares_cancel.pdf		\
 
 SAMPLESOURCES = ares_getopt.c		\
   ares_nowarn.c				\
-  ares_strcasecmp.c			\
-  inet_net_pton.c			\
-  inet_ntop.c
+  ares_strcasecmp.c
 
 SAMPLEHEADERS = ares_getopt.h		\
   ares_nowarn.h				\
-  ares_strcasecmp.h			\
-  inet_net_pton.h			\
-  inet_ntop.h
+  ares_strcasecmp.h
diff --git a/acountry.c b/acountry.c
index 7a855c0..210ef84 100644
--- a/acountry.c
+++ b/acountry.c
@@ -48,8 +48,6 @@
 
 #include "ares.h"
 #include "ares_getopt.h"
-#include "inet_net_pton.h"
-#include "inet_ntop.h"
 #include "ares_nowarn.h"
 
 #ifndef HAVE_STRDUP
diff --git a/adig.c b/adig.c
index 4783101..e112dc0 100644
--- a/adig.c
+++ b/adig.c
@@ -40,8 +40,6 @@
 
 #include "ares.h"
 #include "ares_dns.h"
-#include "inet_ntop.h"
-#include "inet_net_pton.h"
 #include "ares_getopt.h"
 #include "ares_nowarn.h"
 
diff --git a/ahost.c b/ahost.c
index cb2bea1..fd6e50d 100644
--- a/ahost.c
+++ b/ahost.c
@@ -28,8 +28,6 @@
 
 #include "ares.h"
 #include "ares_dns.h"
-#include "inet_ntop.h"
-#include "inet_net_pton.h"
 #include "ares_getopt.h"
 #include "ares_ipv6.h"
 #include "ares_nowarn.h"
diff --git a/ares.h b/ares.h
index f0cc824..aaf0635 100644
--- a/ares.h
+++ b/ares.h
@@ -1,6 +1,6 @@
 
 /* Copyright 1998, 2009 by the Massachusetts Institute of Technology.
- * Copyright (C) 2007-2011 by Daniel Stenberg
+ * Copyright (C) 2007-2013 by Daniel Stenberg
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
@@ -579,6 +579,12 @@ CARES_EXTERN int ares_set_servers_csv(ares_channel channel,
 CARES_EXTERN int ares_get_servers(ares_channel channel,
                                   struct ares_addr_node **servers);
 
+CARES_EXTERN const char *ares_inet_ntop(int af, const void *src, char *dst,
+                                        socklen_t size);
+
+CARES_EXTERN int ares_inet_pton(int af, const char *src, void *dst);
+
+
 #ifdef  __cplusplus
 }
 #endif
diff --git a/ares__get_hostent.c b/ares__get_hostent.c
index a9a80ef..4497d60 100644
--- a/ares__get_hostent.c
+++ b/ares__get_hostent.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "ares.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 #include "ares_nowarn.h"
 #include "ares_private.h"
 
diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c
index 669a29d..85862e2 100644
--- a/ares_gethostbyaddr.c
+++ b/ares_gethostbyaddr.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "ares.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 #include "ares_platform.h"
 #include "ares_private.h"
 
diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c
index 14cf7ef..2b27b2e 100644
--- a/ares_gethostbyname.c
+++ b/ares_gethostbyname.c
@@ -1,5 +1,5 @@
 
-/* Copyright 1998, 2011 by the Massachusetts Institute of Technology.
+/* Copyright 1998, 2011, 2013 by the Massachusetts Institute of Technology.
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
@@ -39,7 +39,7 @@
 #endif
 
 #include "ares.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 #include "bitncmp.h"
 #include "ares_platform.h"
 #include "ares_nowarn.h"
diff --git a/ares_getnameinfo.c b/ares_getnameinfo.c
index 75cb7ed..5b9f638 100644
--- a/ares_getnameinfo.c
+++ b/ares_getnameinfo.c
@@ -46,7 +46,6 @@
 
 #include "ares.h"
 #include "ares_ipv6.h"
-#include "inet_ntop.h"
 #include "ares_nowarn.h"
 #include "ares_private.h"
 
diff --git a/inet_net_pton.h b/ares_inet_net_pton.h
similarity index 82%
rename from inet_net_pton.h
rename to ares_inet_net_pton.h
index 5396a7f..90da2cc 100644
--- a/inet_net_pton.h
+++ b/ares_inet_net_pton.h
@@ -1,7 +1,7 @@
 #ifndef HEADER_CARES_INET_NET_PTON_H
 #define HEADER_CARES_INET_NET_PTON_H
 
-/* Copyright (C) 2005-2010 by Daniel Stenberg et al
+/* Copyright (C) 2005-2013 by Daniel Stenberg et al
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
@@ -16,12 +16,6 @@
  * without express or implied warranty.
  */
 
-#ifdef HAVE_INET_PTON
-#define ares_inet_pton(x,y,z) inet_pton(x,y,z)
-#else
-int ares_inet_pton(int af, const char *src, void *dst);
-#endif
-
 #ifdef HAVE_INET_NET_PTON
 #define ares_inet_net_pton(w,x,y,z) inet_net_pton(w,x,y,z)
 #else
diff --git a/ares_init.c b/ares_init.c
index ddcc4f9..d23c1b0 100644
--- a/ares_init.c
+++ b/ares_init.c
@@ -1,6 +1,6 @@
 
 /* Copyright 1998 by the Massachusetts Institute of Technology.
- * Copyright (C) 2007-2012 by Daniel Stenberg
+ * Copyright (C) 2007-2013 by Daniel Stenberg
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
@@ -50,8 +50,7 @@
 #endif
 
 #include "ares.h"
-#include "inet_ntop.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 #include "ares_library_init.h"
 #include "ares_nowarn.h"
 #include "ares_platform.h"
diff --git a/ares_options.c b/ares_options.c
index 5174ef2..5466cb2 100644
--- a/ares_options.c
+++ b/ares_options.c
@@ -1,6 +1,6 @@
 
 /* Copyright 1998 by the Massachusetts Institute of Technology.
- * Copyright (C) 2008-2011 by Daniel Stenberg
+ * Copyright (C) 2008-2013 by Daniel Stenberg
  *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
@@ -24,7 +24,7 @@
 
 #include "ares.h"
 #include "ares_data.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 #include "ares_private.h"
 
 
diff --git a/ares_parse_aaaa_reply.c b/ares_parse_aaaa_reply.c
index f5b6eae..7731249 100644
--- a/ares_parse_aaaa_reply.c
+++ b/ares_parse_aaaa_reply.c
@@ -45,7 +45,7 @@
 
 #include "ares.h"
 #include "ares_dns.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 #include "ares_private.h"
 
 int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
diff --git a/inet_net_pton.c b/inet_net_pton.c
index 8199934..71c07c5 100644
--- a/inet_net_pton.c
+++ b/inet_net_pton.c
@@ -36,7 +36,7 @@
 #include "ares.h"
 #include "ares_ipv6.h"
 #include "ares_nowarn.h"
-#include "inet_net_pton.h"
+#include "ares_inet_net_pton.h"
 
 
 const struct ares_in6_addr ares_in6addr_any = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
@@ -440,4 +440,11 @@ int ares_inet_pton(int af, const char *src, void *dst)
     return 0;
   return (result > -1 ? 1 : -1);
 }
+#else /* HAVE_INET_PTON */
+int ares_inet_pton(int af, const char *src, void *dst)
+{
+  /* just relay this to the underlying function */
+  return inet_pton(af, src, dst);
+}
+
 #endif
diff --git a/inet_ntop.c b/inet_ntop.c
index ea1ebb8..77fe4a6 100644
--- a/inet_ntop.c
+++ b/inet_ntop.c
@@ -34,8 +34,6 @@
 
 #include "ares.h"
 #include "ares_ipv6.h"
-#include "inet_ntop.h"
-
 
 #ifndef HAVE_INET_NTOP
 
@@ -61,7 +59,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size);
  *     Paul Vixie, 1996.
  */
 const char *
-ares_inet_ntop(int af, const void *src, char *dst, size_t size)
+ares_inet_ntop(int af, const void *src, char *dst, socklen_t size)
 {
   switch (af) {
   case AF_INET:
@@ -197,4 +195,11 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
   strcpy(dst, tmp);
   return (dst);
 }
-#endif
+#else /* HAVE_INET_NTOP */
+
+const char *ares_inet_ntop(int af, const void *src, char *dst, socklen_t size)
+{
+  /* just relay this to the underlying function */
+  return inet_ntop(af, src, dst, size);
+}
+#endif /* HAVE_INET_NTOP */
diff --git a/inet_ntop.h b/inet_ntop.h
deleted file mode 100644
index c583488..0000000
--- a/inet_ntop.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __ARES_INET_NTOP_H
-#define __ARES_INET_NTOP_H
-
-
-/* Copyright (C) 2005 by Dominick Meglio
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-#ifdef HAVE_INET_NTOP
-#define ares_inet_ntop(w,x,y,z) inet_ntop(w,x,y,z)
-#else
-const char *ares_inet_ntop(int af, const void *src, char *dst, size_t size);
-#endif
-
-#endif /* __ARES_INET_NTOP_H */