diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt
index ab0ba17..a3b011d 100644
--- a/src/net/CMakeLists.txt
+++ b/src/net/CMakeLists.txt
@@ -1,4 +1,24 @@
-file(GLOB PRIVATE_SOURCES "*.cpp" "connection/*.cpp" "grunt/*.cpp" "login/*.cpp" "srp/*.cpp")
+file(GLOB PRIVATE_SOURCES
+    "*.cpp"
+    "connection/*.cpp"
+    "grunt/*.cpp"
+    "login/*.cpp"
+    "srp/*.cpp"
+)
+
+if(WHOA_SYSTEM_WIN)
+    file(GLOB WINSOCK_SOURCES
+        "connection/winsock/*.cpp"
+    )
+    list(APPEND PRIVATE_SOURCES ${WINSOCK_SOURCES})
+endif()
+
+if(WHOA_SYSTEM_MAC OR WHOA_SYSTEM_LINUX)
+    file(GLOB BSD_SOURCES
+        "connection/bsd/*.cpp"
+    )
+    list(APPEND PRIVATE_SOURCES ${BSD_SOURCES})
+endif()
 
 add_library(net STATIC
     ${PRIVATE_SOURCES}
diff --git a/src/net/connection/WowConnectionNetMac.cpp b/src/net/connection/bsd/WowConnectionNet.cpp
similarity index 98%
rename from src/net/connection/WowConnectionNetMac.cpp
rename to src/net/connection/bsd/WowConnectionNet.cpp
index e28ea87..0602134 100644
--- a/src/net/connection/WowConnectionNetMac.cpp
+++ b/src/net/connection/bsd/WowConnectionNet.cpp
@@ -1,5 +1,3 @@
-#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
-
 #include "net/connection/WowConnectionNet.hpp"
 #include "net/connection/WowConnection.hpp"
 #include <algorithm>
@@ -187,5 +185,3 @@ void WowConnectionNet::PlatformWorkerReady() {
     char buf = '\1';
     write(s_workerPipe[1], &buf, sizeof(buf));
 }
-
-#endif
diff --git a/src/net/connection/WowConnectionNetWin.cpp b/src/net/connection/winsock/WowConnectionNet.cpp
similarity index 92%
rename from src/net/connection/WowConnectionNetWin.cpp
rename to src/net/connection/winsock/WowConnectionNet.cpp
index c1af37e..988b57e 100644
--- a/src/net/connection/WowConnectionNetWin.cpp
+++ b/src/net/connection/winsock/WowConnectionNet.cpp
@@ -1,5 +1,3 @@
-#if defined(WHOA_SYSTEM_WIN)
-
 #include "net/connection/WowConnectionNet.hpp"
 
 void WowConnectionNet::PlatformAdd(WowConnection* connection) {
@@ -25,5 +23,3 @@ void WowConnectionNet::PlatformRun() {
 void WowConnectionNet::PlatformWorkerReady() {
     // TODO
 }
-
-#endif