diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f6e7904e..644c75a84 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -321,9 +321,17 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
 TARGET_LINK_LIBRARIES( tomahawk
     ${QT_LIBRARIES}
     ${MAC_EXTRA_LIBS}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-    echonest
     portfwd
+    ${OS_SPECIFIC_LINK_LIBRARIES}
+    lastfm
+    qjson
+    tag
+    mad
+    vorbis
+    vorbisenc
+    vorbisfile
+    gloox
+    echonest
 )
 
 INCLUDE( "CPack.txt" )
diff --git a/src/CMakeLists.win32.txt b/src/CMakeLists.win32.txt
index 993cef0ce..98151568a 100644
--- a/src/CMakeLists.win32.txt
+++ b/src/CMakeLists.win32.txt
@@ -1,6 +1,8 @@
 ADD_DEFINITIONS( /DNOMINMAX )
 ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
 ADD_DEFINITIONS( -static-libgcc )
+ADD_DEFINITIONS( /DNO_LIBLASTFM )
+ADD_DEFINITIONS( -DNO_OGG )
 
 # Add manual locations to stuff:
 INCLUDE_DIRECTORIES(
@@ -16,12 +18,8 @@ INCLUDE_DIRECTORIES(
 )
 
 SET( OS_SPECIFIC_LINK_LIBRARIES 
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../gloox-1.0/src/.libs/libgloox.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../qjson/build/lib/libqjson.dll.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../taglib-1.6.3/build/taglib/libtag.dll"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.3/lib/libz.a"
 	"secur32.dll"
-	"Crypt32.dll"
+	"crypt32.dll"
 	"ws2_32.dll"
 	"dnsapi.dll"
 	"${CMAKE_CURRENT_SOURCE_DIR}/../qxtweb-standalone/libqxtweb-standalone.dll"
@@ -29,7 +27,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 
 SET( OS_SPECIFIC_LINK_LIBRARIES 
 	${OS_SPECIFIC_LINK_LIBRARIES} 
-	"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
+	#"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
 	)
 
 IF( "${gui}" STREQUAL "no" )
@@ -42,10 +40,9 @@ ELSE()
 	SET( OS_SPECIFIC_LINK_LIBRARIES 
 		 ${OS_SPECIFIC_LINK_LIBRARIES} 
 		 "dsound.dll" 
-		 "winmm.dll" 
+		 "winmm.dll"
+                 "iphlpapi.a"
 		 "${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/libmad.dll"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/libvorbisfile.dll"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/liblastfm.dll"
 	)
-ENDIF()
\ No newline at end of file
+ENDIF()
+
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index f3e18b5f0..09c3a9008 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QNetworkProxy>
 
 #ifndef NO_LIBLASTFM
 #include <lastfm/ws.h>