diff --git a/goalc/CMakeLists.txt b/goalc/CMakeLists.txt
index ee0a59f2fd..5365a1f48c 100644
--- a/goalc/CMakeLists.txt
+++ b/goalc/CMakeLists.txt
@@ -17,13 +17,14 @@ add_library(compiler
         regalloc/IRegister.cpp
         regalloc/Allocator.cpp
         regalloc/allocate.cpp
-        compiler/Compiler.cpp
-        )
+        compiler/Compiler.cpp)
 
 add_executable(goalc main.cpp)
 
 IF (WIN32)
-  target_link_libraries(compiler cross_sockets util goos type_system mman)
-ELSE()
-	target_link_libraries(compiler cross_sockets util goos goalc type_system)
+	target_link_libraries(compiler fmt mman type_system)
+ELSE ()
+	target_link_libraries(compiler fmt type_system)
 ENDIF()
+
+target_link_libraries(goalc util goos compiler)
\ No newline at end of file
diff --git a/goalc/listener/CMakeLists.txt b/goalc/listener/CMakeLists.txt
index f978b4d633..adbaeb88e3 100644
--- a/goalc/listener/CMakeLists.txt
+++ b/goalc/listener/CMakeLists.txt
@@ -1,2 +1,3 @@
-add_library(listener SHARED
-        Listener.cpp)
+add_library(listener SHARED Listener.cpp)
+
+target_link_libraries(listener cross_sockets)
\ No newline at end of file