diff --git a/pokerth_game.pro b/pokerth_game.pro
index a9cfc8f2..baddc3fa 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -320,7 +320,9 @@ win32 {
 		-lpokerth_protocol \
 		-lSDL_mixer \
 		-lSDL \
-		-lSDLmain
+		-lSDLmain \
+		-lcurl \
+		-lz
 	debug:LIBPATH += rebug/lib
 	release:LIBPATH += release/lib
 	pkth_win64 {
@@ -329,10 +331,8 @@ win32 {
 	!pkth_win64 {
 		LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
 	}
-	LIBS += -lcurl
-	LIBS += -lz
 	win32-g++-cross {
-		LIBS += -lntlm -lidn -lmikmod
+		LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg
 		LIBS += -lboost_thread_win32-mt
 		LIBS += -lboost_filesystem-mt
 		LIBS += -lboost_regex-mt
diff --git a/pokerth_server.pro b/pokerth_server.pro
index bd517107..cc74a14b 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -121,34 +121,36 @@ win32 {
 
 	LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../openssl/lib ../gsasl/lib ../curl/lib ../mysql/lib ../zlib
 
-	LIBS += -lpokerth_lib -lpokerth_db -lpokerth_protocol
+	LIBS += -lpokerth_lib \
+		-lpokerth_db \
+		-lpokerth_protocol \
+		-lcurl \
+		-lz
 
 	debug:LIBPATH += Debug/lib
 	release:LIBPATH += Release/lib
 
-	win32-msvc2008 {
-		LIBS += -llibgnutls-openssl-26 \
-				-llibgcrypt-11 \
-				-llibgsasl-7 \
-				-llibcurl
+	pkth_win64 {
+		LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
+	}
+	!pkth_win64 {
+		LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn
+	}
+	win32-g++-cross {
+		LIBS += -lntlm
+		LIBS += -lboost_thread_win32-mt
+		LIBS += -lboost_filesystem-mt
+		LIBS += -lboost_regex-mt
+		LIBS += -lboost_iostreams-mt
+		LIBS += -lboost_system-mt
 	}
-
 	win32-g++ {
-		pkth_win64 {
-			LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
-		}
-		!pkth_win64 {
-			LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn
-		}
-		LIBS += -lcurl
-		LIBS += -lz
 		LIBS += -lboost_thread-mgw45-mt-1_44.dll
 		LIBS += -lboost_filesystem-mgw45-mt-1_44.dll
 		LIBS += -lboost_regex-mgw45-mt-1_44
-		LIBS += -lboost_system-mgw45-mt-1_44.dll
 		LIBS += -lboost_iostreams-mgw45-mt-1_44.dll
 		LIBS += -lboost_zlib-mgw45-mt-1_44.dll
-		LIBS += -lboost_program_options-mgw45-mt-1_44.dll
+		LIBS += -lboost_system-mgw45-mt-1_44.dll
 	}
 
 	LIBS += -lgdi32 \