diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h
index d7e3e264..71d552e1 100644
--- a/include/gtest/gtest.h
+++ b/include/gtest/gtest.h
@@ -359,8 +359,8 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
 //
 //   class FooTest : public testing::Test {
 //    protected:
-//     virtual void SetUp() { ... }
-//     virtual void TearDown() { ... }
+//     void SetUp() override { ... }
+//     void TearDown() override { ... }
 //     ...
 //   };
 //
diff --git a/src/gtest.cc b/src/gtest.cc
index dc06e022..64ab7670 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -128,6 +128,8 @@
 #if GTEST_CAN_STREAM_RESULTS_
 # include <arpa/inet.h>  // NOLINT
 # include <netdb.h>  // NOLINT
+# include <sys/socket.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
 #endif
 
 // Indicates that this translation unit is part of Google Test's