diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
index a70c637bf..19402847f 100644
--- a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
@@ -1,7 +1,7 @@
 /*
  * RemoteZynAddSubFx.cpp - ZynAddSubFx-embedding plugin
  *
- * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -23,6 +23,10 @@
  */
 
 #include <lmmsconfig.h>
+#ifdef LMMS_BUILD_WIN32
+#include <winsock2.h>
+#endif
+
 #include <queue>
 
 #define BUILD_REMOTE_PLUGIN_CLIENT
diff --git a/plugins/zynaddsubfx/fltk/CMakeLists.txt b/plugins/zynaddsubfx/fltk/CMakeLists.txt
index d877e6c18..5010016f3 100644
--- a/plugins/zynaddsubfx/fltk/CMakeLists.txt
+++ b/plugins/zynaddsubfx/fltk/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(LIBRARY_OUTPUT_PATH "${FLTK_BINARY_DIR}/bin" CACHE INTERNAL
 OPTION(BUILD_SHARED_LIBS "Build FLTK as a shared library" OFF)
 
 # Search for modules in the FLTK source dir first
-SET(CMAKE_MODULE_PATH "${FLTK_SOURCE_DIR}/CMake")
+SET(CMAKE_MODULE_PATH ${FLTK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})
 
 #-----------------------------------------------------------------------------
 # Test for some required system information.
diff --git a/plugins/zynaddsubfx/fltk/FL/win32.H b/plugins/zynaddsubfx/fltk/FL/win32.H
index a9f482979..ddd7230f1 100644
--- a/plugins/zynaddsubfx/fltk/FL/win32.H
+++ b/plugins/zynaddsubfx/fltk/FL/win32.H
@@ -34,6 +34,7 @@
 #  error "Never use <FL/win32.H> directly; include <FL/x.H> instead."
 #endif // !Fl_X_H
 
+#include <winsock2.h>
 #include <windows.h>
 // In some of the distributions, the gcc header files are missing some stuff:
 #ifndef LPMINMAXINFO
diff --git a/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx b/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx
index 1d2b617d1..58ae297e6 100644
--- a/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx
+++ b/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx
@@ -187,6 +187,7 @@ int Fl::awake(Fl_Awake_Handler func, void *data) {
     See also: \ref advanced_multithreading
 */
 #ifdef WIN32
+#  include <winsock2.h>
 #  include <windows.h>
 #  include <process.h>
 #  include <FL/x.H>