From 1c956494a4d578725d7185568966c360932d53df Mon Sep 17 00:00:00 2001
From: staphen <staphen@gmail.com>
Date: Mon, 27 Dec 2021 14:07:35 -0500
Subject: [PATCH] Use lowercase when including Windows headers

---
 include/ZeroTierOne.h                      | 6 +++---
 node/Constants.hpp                         | 4 ++--
 node/Mutex.hpp                             | 2 +-
 one.cpp                                    | 4 ++--
 osdep/Binder.hpp                           | 6 +++---
 osdep/Http.hpp                             | 6 +++---
 osdep/ManagedRoute.cpp                     | 4 ++--
 osdep/OSUtils.cpp                          | 2 +-
 osdep/OSUtils.hpp                          | 6 +++---
 osdep/Phy.hpp                              | 6 +++---
 osdep/Thread.hpp                           | 4 ++--
 osdep/WindowsEthernetTap.cpp               | 6 +++---
 service/OneService.cpp                     | 6 +++---
 service/SoftwareUpdater.cpp                | 6 +++---
 windows/ZeroTierOne/ServiceBase.h          | 2 +-
 windows/ZeroTierOne/ZeroTierOneService.cpp | 4 ++--
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
index 2bdea6474..4f73880b9 100644
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@@ -23,9 +23,9 @@
 
 // For the struct sockaddr_storage structure
 #if defined(_WIN32) || defined(_WIN64)
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
 #else /* not Windows */
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/node/Constants.hpp b/node/Constants.hpp
index 21d0754ec..760a8ad2f 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -92,8 +92,8 @@
 #pragma warning(disable : 4101)
 #undef __UNIX_LIKE__
 #undef __BSD__
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #endif
 
 #ifdef __NetBSD__
diff --git a/node/Mutex.hpp b/node/Mutex.hpp
index 13e1b0aae..29e10fe46 100644
--- a/node/Mutex.hpp
+++ b/node/Mutex.hpp
@@ -86,7 +86,7 @@ private:
 #ifdef __WINDOWS__
 
 #include <stdlib.h>
-#include <Windows.h>
+#include <windows.h>
 
 namespace ZeroTier {
 
diff --git a/one.cpp b/one.cpp
index b597cabbe..cfd94fd52 100644
--- a/one.cpp
+++ b/one.cpp
@@ -25,8 +25,8 @@
 #include "node/Constants.hpp"
 
 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <tchar.h>
 #include <wchar.h>
 #include <lmcons.h>
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp
index 0c7ec4465..82568373a 100644
--- a/osdep/Binder.hpp
+++ b/osdep/Binder.hpp
@@ -22,9 +22,9 @@
 #include <string.h>
 
 #ifdef __WINDOWS__
-#include <ShlObj.h>
-#include <WinSock2.h>
-#include <Windows.h>
+#include <shlobj.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <iphlpapi.h>
 #include <netioapi.h>
 #else
diff --git a/osdep/Http.hpp b/osdep/Http.hpp
index 684215640..0854fa1aa 100644
--- a/osdep/Http.hpp
+++ b/osdep/Http.hpp
@@ -19,9 +19,9 @@
 #include <stdexcept>
 
 #if defined(_WIN32) || defined(_WIN64)
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #include <sys/time.h>
diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp
index 904917c25..746808112 100644
--- a/osdep/ManagedRoute.cpp
+++ b/osdep/ManagedRoute.cpp
@@ -19,8 +19,8 @@
 #include <string.h>
 
 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <netioapi.h>
 #include <IPHlpApi.h>
 #endif
diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
index 5111bc9d5..ab3f1078b 100644
--- a/osdep/OSUtils.cpp
+++ b/osdep/OSUtils.cpp
@@ -36,7 +36,7 @@
 #ifdef __WINDOWS__
 #include <windows.h>
 #include <wincrypt.h>
-#include <ShlObj.h>
+#include <shlobj.h>
 #include <netioapi.h>
 #include <iphlpapi.h>
 #endif
diff --git a/osdep/OSUtils.hpp b/osdep/OSUtils.hpp
index e9b70d234..99a1ee0d8 100644
--- a/osdep/OSUtils.hpp
+++ b/osdep/OSUtils.hpp
@@ -28,9 +28,9 @@
 #include "../node/InetAddress.hpp"
 
 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
-#include <Shlwapi.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <shlwapi.h>
 #else
 #include <unistd.h>
 #include <errno.h>
diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp
index e8c7a5bf0..b84ff128e 100644
--- a/osdep/Phy.hpp
+++ b/osdep/Phy.hpp
@@ -23,9 +23,9 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
 
 #define ZT_PHY_SOCKFD_TYPE SOCKET
 #define ZT_PHY_SOCKFD_NULL (INVALID_SOCKET)
diff --git a/osdep/Thread.hpp b/osdep/Thread.hpp
index 1b0c354a9..0c357cd2d 100644
--- a/osdep/Thread.hpp
+++ b/osdep/Thread.hpp
@@ -20,8 +20,8 @@
 
 #ifdef __WINDOWS__
 
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <string.h>
 
 #include "../node/Mutex.hpp"
diff --git a/osdep/WindowsEthernetTap.cpp b/osdep/WindowsEthernetTap.cpp
index 460385b0e..c0dcbd98f 100644
--- a/osdep/WindowsEthernetTap.cpp
+++ b/osdep/WindowsEthernetTap.cpp
@@ -15,14 +15,14 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <tchar.h>
 #include <malloc.h>
 #include <winreg.h>
 #include <wchar.h>
 #include <ws2ipdef.h>
-#include <WS2tcpip.h>
+#include <ws2tcpip.h>
 #include <IPHlpApi.h>
 #include <nldef.h>
 #include <netioapi.h>
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 255bad21e..430b50108 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -54,9 +54,9 @@
 #include "SoftwareUpdater.hpp"
 
 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
-#include <ShlObj.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <shlobj.h>
 #include <netioapi.h>
 #include <iphlpapi.h>
 //#include <unistd.h>
diff --git a/service/SoftwareUpdater.cpp b/service/SoftwareUpdater.cpp
index e58b6ad32..8294e63c1 100644
--- a/service/SoftwareUpdater.cpp
+++ b/service/SoftwareUpdater.cpp
@@ -20,9 +20,9 @@
 #include "../version.h"
 
 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
-#include <ShlObj.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <shlobj.h>
 #include <netioapi.h>
 #include <iphlpapi.h>
 #else
diff --git a/windows/ZeroTierOne/ServiceBase.h b/windows/ZeroTierOne/ServiceBase.h
index 6d62b1f81..cb276ff10 100644
--- a/windows/ZeroTierOne/ServiceBase.h
+++ b/windows/ZeroTierOne/ServiceBase.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
 
 class CServiceBase
diff --git a/windows/ZeroTierOne/ZeroTierOneService.cpp b/windows/ZeroTierOne/ZeroTierOneService.cpp
index bb2b2e631..c1de4ed97 100644
--- a/windows/ZeroTierOne/ZeroTierOneService.cpp
+++ b/windows/ZeroTierOne/ZeroTierOneService.cpp
@@ -15,8 +15,8 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>