diff --git a/YSFGateway/UDPSocket.cpp b/YSFGateway/UDPSocket.cpp
index 382925f..3f6192a 100644
--- a/YSFGateway/UDPSocket.cpp
+++ b/YSFGateway/UDPSocket.cpp
@@ -37,12 +37,6 @@ m_address_save(address),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -56,12 +50,6 @@ m_address_save(),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -72,6 +60,20 @@ m_counter(0U)
 
 CUDPSocket::~CUDPSocket()
 {
+}
+
+void CUDPSocket::startup()
+{
+#if defined(_WIN32) || defined(_WIN64)
+	WSAData data;
+	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
+	if (wsaRet != 0)
+		LogError("Error from WSAStartup");
+#endif
+}
+
+void CUDPSocket::shutdown()
+{
 #if defined(_WIN32) || defined(_WIN64)
 	::WSACleanup();
 #endif
diff --git a/YSFGateway/UDPSocket.h b/YSFGateway/UDPSocket.h
index 3f5585b..6e3846c 100644
--- a/YSFGateway/UDPSocket.h
+++ b/YSFGateway/UDPSocket.h
@@ -60,8 +60,12 @@ public:
 	void close();
 	void close(const unsigned int index);
 
+	static void startup();
+	static void shutdown();
+
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length);
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints);
+
 	static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
 
 	static bool isNone(const sockaddr_storage& addr);
diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp
index 1e3014f..6af3aa6 100644
--- a/YSFGateway/YSFGateway.cpp
+++ b/YSFGateway/YSFGateway.cpp
@@ -96,10 +96,12 @@ m_lostTimer(1000U, 120U),
 m_fcsNetworkEnabled(false),
 m_remoteSocket(NULL)
 {
+	CUDPSocket::startup();
 }
 
 CYSFGateway::~CYSFGateway()
 {
+	CUDPSocket::shutdown();
 }
 
 int CYSFGateway::run()
diff --git a/YSFParrot/UDPSocket.cpp b/YSFParrot/UDPSocket.cpp
index 382925f..3f6192a 100644
--- a/YSFParrot/UDPSocket.cpp
+++ b/YSFParrot/UDPSocket.cpp
@@ -37,12 +37,6 @@ m_address_save(address),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -56,12 +50,6 @@ m_address_save(),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -72,6 +60,20 @@ m_counter(0U)
 
 CUDPSocket::~CUDPSocket()
 {
+}
+
+void CUDPSocket::startup()
+{
+#if defined(_WIN32) || defined(_WIN64)
+	WSAData data;
+	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
+	if (wsaRet != 0)
+		LogError("Error from WSAStartup");
+#endif
+}
+
+void CUDPSocket::shutdown()
+{
 #if defined(_WIN32) || defined(_WIN64)
 	::WSACleanup();
 #endif
diff --git a/YSFParrot/UDPSocket.h b/YSFParrot/UDPSocket.h
index 3f5585b..6e3846c 100644
--- a/YSFParrot/UDPSocket.h
+++ b/YSFParrot/UDPSocket.h
@@ -60,8 +60,12 @@ public:
 	void close();
 	void close(const unsigned int index);
 
+	static void startup();
+	static void shutdown();
+
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length);
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints);
+
 	static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
 
 	static bool isNone(const sockaddr_storage& addr);
diff --git a/YSFParrot/YSFParrot.cpp b/YSFParrot/YSFParrot.cpp
index 5c0a8bc..8eee946 100644
--- a/YSFParrot/YSFParrot.cpp
+++ b/YSFParrot/YSFParrot.cpp
@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016,2018 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2018,2020 by Jonathan Naylor G4KLX
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -50,10 +50,12 @@ int main(int argc, char** argv)
 CYSFParrot::CYSFParrot(unsigned int port) :
 m_port(port)
 {
+	CUDPSocket::startup();
 }
 
 CYSFParrot::~CYSFParrot()
 {
+	CUDPSocket::shutdown();
 }
 
 void CYSFParrot::run()
diff --git a/YSFReflector/UDPSocket.cpp b/YSFReflector/UDPSocket.cpp
index 382925f..3f6192a 100644
--- a/YSFReflector/UDPSocket.cpp
+++ b/YSFReflector/UDPSocket.cpp
@@ -37,12 +37,6 @@ m_address_save(address),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -56,12 +50,6 @@ m_address_save(),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -72,6 +60,20 @@ m_counter(0U)
 
 CUDPSocket::~CUDPSocket()
 {
+}
+
+void CUDPSocket::startup()
+{
+#if defined(_WIN32) || defined(_WIN64)
+	WSAData data;
+	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
+	if (wsaRet != 0)
+		LogError("Error from WSAStartup");
+#endif
+}
+
+void CUDPSocket::shutdown()
+{
 #if defined(_WIN32) || defined(_WIN64)
 	::WSACleanup();
 #endif
diff --git a/YSFReflector/UDPSocket.h b/YSFReflector/UDPSocket.h
index 3f5585b..6e3846c 100644
--- a/YSFReflector/UDPSocket.h
+++ b/YSFReflector/UDPSocket.h
@@ -60,8 +60,12 @@ public:
 	void close();
 	void close(const unsigned int index);
 
+	static void startup();
+	static void shutdown();
+
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length);
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints);
+
 	static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
 
 	static bool isNone(const sockaddr_storage& addr);
diff --git a/YSFReflector/YSFReflector.cpp b/YSFReflector/YSFReflector.cpp
index 4249cb0..957666c 100644
--- a/YSFReflector/YSFReflector.cpp
+++ b/YSFReflector/YSFReflector.cpp
@@ -79,10 +79,12 @@ CYSFReflector::CYSFReflector(const std::string& file) :
 m_conf(file),
 m_repeaters()
 {
+	CUDPSocket::startup();
 }
 
 CYSFReflector::~CYSFReflector()
 {
+	CUDPSocket::shutdown();
 }
 
 void CYSFReflector::run()