diff --git a/src/node_os.cc b/src/node_os.cc
index a5ae53ba75ee3c..17b507d8e3a37d 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -33,17 +33,10 @@
 
 #ifdef __POSIX__
 # include <limits.h>        // PATH_MAX on Solaris.
-# include <netdb.h>         // MAXHOSTNAMELEN on Solaris.
 # include <unistd.h>        // gethostname, sysconf
-# include <sys/param.h>     // MAXHOSTNAMELEN on Linux and the BSDs.
 # include <sys/utsname.h>
 #endif  // __POSIX__
 
-// Add Windows fallback.
-#ifndef MAXHOSTNAMELEN
-# define MAXHOSTNAMELEN 256
-#endif  // MAXHOSTNAMELEN
-
 namespace node {
 namespace os {
 
@@ -67,7 +60,7 @@ using v8::Value;
 
 static void GetHostname(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
-  char buf[MAXHOSTNAMELEN + 1];
+  char buf[UV_MAXHOSTNAMESIZE];
   size_t size = sizeof(buf);
   int r = uv_os_gethostname(buf, &size);
 
diff --git a/src/node_report.cc b/src/node_report.cc
index 1a459a2d1c97a3..8f882b9887424e 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -47,15 +47,6 @@
 extern char** environ;
 #endif
 
-#ifdef __POSIX__
-# include <netdb.h>         // MAXHOSTNAMELEN on Solaris.
-# include <sys/param.h>     // MAXHOSTNAMELEN on Linux and the BSDs.
-#endif  // __POSIX__
-
-#ifndef MAXHOSTNAMELEN
-# define MAXHOSTNAMELEN 256
-#endif  // MAXHOSTNAMELEN
-
 namespace report {
 using node::arraysize;
 using node::Environment;
@@ -377,7 +368,7 @@ static void PrintVersionInformation(JSONWriter* writer) {
     writer->json_keyvalue("osMachine", os_info.machine);
   }
 
-  char host[MAXHOSTNAMELEN + 1];
+  char host[UV_MAXHOSTNAMESIZE];
   size_t host_size = sizeof(host);
 
   if (uv_os_gethostname(host, &host_size) == 0)