diff --git a/lib/libpcpnatpmp/CMakeLists.txt b/lib/libpcpnatpmp/CMakeLists.txt
index 0c765df9ba..e88b9c835d 100644
--- a/lib/libpcpnatpmp/CMakeLists.txt
+++ b/lib/libpcpnatpmp/CMakeLists.txt
@@ -54,7 +54,7 @@ if (WIN32)
         target_compile_definitions(pcpnatpmp PRIVATE HAVE_GETTIMEOFDAY)
     endif(MINGW)
 
-    target_link_libraries (pcpnatpmp INTERFACE ws2_32.lib Iphlpapi.lib)
+    target_link_libraries (pcpnatpmp INTERFACE ws2_32.lib iphlpapi.lib)
 endif ()
 
 suppress_warnings(pcpnatpmp)
diff --git a/lib/libpcpnatpmp/src/net/gateway.c b/lib/libpcpnatpmp/src/net/gateway.c
index f314c2f4e5..e549e0b8d4 100644
--- a/lib/libpcpnatpmp/src/net/gateway.c
+++ b/lib/libpcpnatpmp/src/net/gateway.c
@@ -58,7 +58,7 @@
 #include <winsock2.h>
 #include <ws2ipdef.h>
 
-#include <Iphlpapi.h>
+#include <iphlpapi.h>
 
 #include <ws2tcpip.h>
 
diff --git a/lib/libpcpnatpmp/src/net/pcp_socket.c b/lib/libpcpnatpmp/src/net/pcp_socket.c
index 36cac6fb01..6f7c360cc0 100644
--- a/lib/libpcpnatpmp/src/net/pcp_socket.c
+++ b/lib/libpcpnatpmp/src/net/pcp_socket.c
@@ -528,7 +528,7 @@ static ssize_t pcp_socket_sendto_impl(PCP_SOCKET sock, const void *buf,
         if (WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID,
                      sizeof(GUID), &WSARecvMsg, sizeof(WSARecvMsg),
                      &dwBytesReturned, NULL, NULL) == SOCKET_ERROR) {
-            PCP_LOG(PCP_LOGLVL_PERR, ("WSAIoctl failed"));
+            PCP_LOG(PCP_LOGLVL_PERR, "WSAIoctl failed");
             return 1;
         }
 
diff --git a/lib/libpcpnatpmp/src/pcp_logger.h b/lib/libpcpnatpmp/src/pcp_logger.h
index 71c2527d9c..114a647440 100644
--- a/lib/libpcpnatpmp/src/pcp_logger.h
+++ b/lib/libpcpnatpmp/src/pcp_logger.h
@@ -80,7 +80,7 @@ void pcp_logger(pcp_loglvl_e log_level, const char *fmt, ...)
 #define PCP_LOG(level, fmt, ...)                                               \
     {                                                                          \
         if (level <= PCP_MAX_LOG_LEVEL)                                        \
-            pcp_logger(level, fmt, __VA_ARGS__);                               \
+            pcp_logger(level, fmt, ##__VA_ARGS__);                               \
     }
 
 #define PCP_LOG_END(level)
diff --git a/lib/libpcpnatpmp/src/windows/pcp_gettimeofday.h b/lib/libpcpnatpmp/src/windows/pcp_gettimeofday.h
index fb6f4fa6bd..d1474436dc 100644
--- a/lib/libpcpnatpmp/src/windows/pcp_gettimeofday.h
+++ b/lib/libpcpnatpmp/src/windows/pcp_gettimeofday.h
@@ -26,6 +26,12 @@
 #ifndef PCP_GETTIMEOFDAY
 #define PCP_GETTIMEOFDAY
 
+#ifdef WIN32
+#include <winsock2.h>
+#else
+#include <sys/time.h>
+#endif
+
 int gettimeofday(struct timeval *tv, struct timezone *tz);
 
 #endif /*PCP_GETTIMEOFDAY*/
diff --git a/lib/libpcpnatpmp/src/windows/pcp_win_defines.h b/lib/libpcpnatpmp/src/windows/pcp_win_defines.h
index 3ea66b923b..8ae5c504fe 100644
--- a/lib/libpcpnatpmp/src/windows/pcp_win_defines.h
+++ b/lib/libpcpnatpmp/src/windows/pcp_win_defines.h
@@ -81,7 +81,7 @@ static inline const char *pcp_inet_ntop(int af, const void *src, char *dst,
 
 #define getpid GetCurrentProcessId
 
-int gettimeofday(struct timeval *tv, struct timezone *tz);
+#include "pcp_gettimeofday.h"
 
 #define MSG_DONTWAIT 0x0
 
diff --git a/lib/mdns/mdns.h b/lib/mdns/mdns.h
index fc0725e0f9..b05e013d41 100644
--- a/lib/mdns/mdns.h
+++ b/lib/mdns/mdns.h
@@ -21,8 +21,8 @@
 
 #include <fcntl.h>
 #ifdef _WIN32
-#include <Winsock2.h>
-#include <Ws2tcpip.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #define strncasecmp _strnicmp
 #else
 #include <unistd.h>