diff --git a/include/limits.h b/include/limits.h
index 9836f159c29..59f14a8f0dc 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -303,4 +303,6 @@
 
 #define IOV_MAX        INT_MAX
 
+#define HOST_NAME_MAX  32
+
 #endif /* __INCLUDE_LIMITS_H */
diff --git a/include/sys/param.h b/include/sys/param.h
index 3839cdd29dc..5d29d3ce34b 100644
--- a/include/sys/param.h
+++ b/include/sys/param.h
@@ -25,10 +25,14 @@
  * Included Files
  ****************************************************************************/
 
+#include <limits.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
+#define MAXHOSTNAMELEN HOST_NAME_MAX
+
 /****************************************************************************
  * Public Type Definitions
  ****************************************************************************/
diff --git a/include/unistd.h b/include/unistd.h
index 41a5213a7da..63e5cdd5065 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 #include <nuttx/compiler.h>
+#include <limits.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -256,8 +257,6 @@
 #define STDIN_FILENO                     0       /* File number of stdin */
 #define STDOUT_FILENO                    1       /* File number of stdout */
 
-#define HOST_NAME_MAX                    32
-
 /* Helpers and legacy compatibility definitions */
 
 #define link(p1, p2)                     symlink((p1), (p2))