diff --git a/acinclude.m4 b/acinclude.m4
index 7dff8dffa..9c0443dc2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -829,7 +829,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
         ;;
       *)
         AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
-          [type to use in place of socklen_t if not defined])
+          [Type to use in place of socklen_t when system does not provide it.])
         AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
           [Define to 1 if socklen_t is available or a equivalent is defined.])
         ;;
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index d8d703738..2a87feff2 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -298,7 +298,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
         ;;
       *)
         AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
-          [type to use in place of socklen_t if not defined])
+          [Type to use in place of socklen_t when system does not provide it.])
         AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
           [Define to 1 if socklen_t is available or a equivalent is defined.])
         ;;
diff --git a/lib/config-os400.h b/lib/config-os400.h
index edc398768..edc01e679 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -51,7 +51,7 @@
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 
-/* Define this to 'int' if socklen_t is not an available typedefed type */
+/* Type to use in place of socklen_t when system does not provide it. */
 #undef socklen_t
 
 /* Define this as a suitable file to read random data from */
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 17f76b507..e1160e625 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -44,7 +44,7 @@
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 
-/* Define this to 'int' if socklen_t is not an available typedefed type */
+/* Type to use in place of socklen_t when system does not provide it. */
 #undef socklen_t
 
 /* Define this as a suitable file to read random data from */
@@ -381,9 +381,6 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-/* type to use in place of socklen_t if not defined */
-#undef socklen_t
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef ssize_t
 
diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index ed9977b27..e656ade91 100644
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -785,7 +785,7 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-/* type to use in place of socklen_t if not defined */
+/* Type to use in place of socklen_t when system does not provide it. */
 /* #undef socklen_t */
 
 /* the signed version of size_t */
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 56ef38ac7..85714b84b 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -660,7 +660,7 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-/* type to use in place of socklen_t if not defined */
+/* Type to use in place of socklen_t when system does not provide it. */
 /* #undef socklen_t */
 
 /* the signed version of size_t */
diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h
index 30c5cf059..1fbb9fd62 100644
--- a/packages/vms/config-vms.h
+++ b/packages/vms/config-vms.h
@@ -26,7 +26,7 @@
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #define TIME_WITH_SYS_TIME 1
 
-/* Define this to 'int' if socklen_t is not an available typedefed type */
+/* Type to use in place of socklen_t when system does not provide it.  */
 #define socklen_t size_t
 
 /* The number of bytes in a long double.  */
diff --git a/src/config-riscos.h b/src/config-riscos.h
index 34f475857..544b249e8 100644
--- a/src/config-riscos.h
+++ b/src/config-riscos.h
@@ -47,7 +47,7 @@
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 
-/* Define this to 'int' if socklen_t is not an available typedefed type */
+/* Type to use in place of socklen_t when system does not provide it. */
 #undef socklen_t
 
 /* Define this as a suitable file to read random data from */
@@ -375,9 +375,6 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-/* type to use in place of socklen_t if not defined */
-#undef socklen_t
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef ssize_t