diff --git a/ares/ares_build.h.dist b/ares/ares_build.h.dist
index 6505aec3e..9f32c8f26 100644
--- a/ares/ares_build.h.dist
+++ b/ares/ares_build.h.dist
@@ -110,8 +110,8 @@
 
 #elif defined(__SALFORDC__)
 #  define CARES_SIZEOF_LONG           4
-#  define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-#  define CARES_SIZEOF_ARES_SOCKLEN_T -1
+#  define CARES_TYPEOF_ARES_SOCKLEN_T int
+#  define CARES_SIZEOF_ARES_SOCKLEN_T 4
 
 #elif defined(__BORLANDC__)
 #  define CARES_SIZEOF_LONG           4
@@ -130,8 +130,8 @@
 
 #elif defined(__POCC__)
 #  define CARES_SIZEOF_LONG           4
-#  define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-#  define CARES_SIZEOF_ARES_SOCKLEN_T -1
+#  define CARES_TYPEOF_ARES_SOCKLEN_T int
+#  define CARES_SIZEOF_ARES_SOCKLEN_T 4
 
 #elif defined(__LCC__)
 #  define CARES_SIZEOF_LONG           4
@@ -150,13 +150,13 @@
 
 #elif defined(_WIN32_WCE)
 #  define CARES_SIZEOF_LONG           4
-#  define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-#  define CARES_SIZEOF_ARES_SOCKLEN_T -1
+#  define CARES_TYPEOF_ARES_SOCKLEN_T int
+#  define CARES_SIZEOF_ARES_SOCKLEN_T 4
 
 #elif defined(__MINGW32__)
 #  define CARES_SIZEOF_LONG           4
-#  define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-#  define CARES_SIZEOF_ARES_SOCKLEN_T -1
+#  define CARES_TYPEOF_ARES_SOCKLEN_T int
+#  define CARES_SIZEOF_ARES_SOCKLEN_T 4
 
 #elif defined(__VMS)
 #  define CARES_SIZEOF_LONG           4
diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index 20fdef8ac..3f55979c6 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -195,8 +195,8 @@
 #  define CURL_SIZEOF_CURL_OFF_T     4
 #  define CURL_SUFFIX_CURL_OFF_T     L
 #  define CURL_SUFFIX_CURL_OFF_TU    UL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-#  define CURL_SIZEOF_CURL_SOCKLEN_T -1
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
 
 #elif defined(__BORLANDC__)
 #  if (__BORLANDC__ < 0x520)
@@ -285,8 +285,8 @@
 #    define CURL_SUFFIX_CURL_OFF_T     LL
 #    define CURL_SUFFIX_CURL_OFF_TU    ULL
 #  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-#  define CURL_SIZEOF_CURL_SOCKLEN_T -1
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
 
 #elif defined(__LCC__)
 #  define CURL_SIZEOF_LONG           4
@@ -354,8 +354,8 @@
 #  define CURL_SIZEOF_CURL_OFF_T     8
 #  define CURL_SUFFIX_CURL_OFF_T     i64
 #  define CURL_SUFFIX_CURL_OFF_TU    ui64
-#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-#  define CURL_SIZEOF_CURL_SOCKLEN_T -1
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
 
 #elif defined(__MINGW32__)
 #  define CURL_SIZEOF_LONG           4
@@ -366,8 +366,8 @@
 #  define CURL_SIZEOF_CURL_OFF_T     8
 #  define CURL_SUFFIX_CURL_OFF_T     LL
 #  define CURL_SUFFIX_CURL_OFF_TU    ULL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-#  define CURL_SIZEOF_CURL_SOCKLEN_T -1
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
 
 #elif defined(__VMS)
 #  if defined(__alpha) || defined(__ia64)