diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59d0c0b276432c12be28ad2b6197a712cacfa8db..ba5ec97e6897f0f43d7104e19fcf92499d353616 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,6 +141,7 @@ ADD_SUBDIRECTORY( core )
 
 OPTION( OW_FIX_BOOST_PO_ARG "Enable this to enable the boost::program_options linker fix." ON )
 OPTION( OW_FIX_EIGENSYSTEM_GCC_PARSE_ERROR "Enable this to disable the eigenSystem module. It causes trouble when using GCC and the latest eigen3 lib." ON )
+OPTION( OW_FIX_EEP_WINDOWS_ERROR "Enable this to disable the EEP Reader. It causes trouble when in the winnt.h header on Windows." OFF )
 
 # -----------------------------------------------------------------------------------------------------------------------------------------------
 # QT GUI
diff --git a/src/modules/data/CMakeLists.txt b/src/modules/data/CMakeLists.txt
index eaa10e1c40f54318c9c189203eb0d5afbae50183..eb1569c32c4657d5560c9f73e5c66c6911a3faea 100644
--- a/src/modules/data/CMakeLists.txt
+++ b/src/modules/data/CMakeLists.txt
@@ -75,14 +75,19 @@ ENDIF()
 # -----------------------------------------------------------------------------------------------------------------------------------------------
 # other external libs
 
-SET( OWExtEEPName    "openwalnut_eep" )
+SET( OWExtEEPName "" )
+IF( NOT OW_FIX_EEP_WINDOWS_ERROR )
+    ADD_DEFINITIONS( "-DWEEP_ENABLED" )
 
-# libcnt needs absolute inclusion somewhere
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext/libeep )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext )
+    SET( OWExtEEPName    "openwalnut_eep" )
 
-# build external libs in ext/
-ADD_SUBDIRECTORY( ext/libeep) # The needed external libraries
+    # libcnt needs absolute inclusion somewhere
+    INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext/libeep )
+    INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext )
+
+    # build external libs in ext/
+    ADD_SUBDIRECTORY( ext/libeep ) # The needed external libraries
+ENDIF()
 
 # ---------------------------------------------------------------------------------------------------------------------------------------------------
 # Setup for compilation
diff --git a/src/modules/data/WMData.cpp b/src/modules/data/WMData.cpp
index 147d1406c9af7020b0aeb8873b59ef580a70752e..1dfc8b789c4fcd0bda18b77a4791419bff132d72 100644
--- a/src/modules/data/WMData.cpp
+++ b/src/modules/data/WMData.cpp
@@ -50,9 +50,11 @@
 #include "io/WReaderNIfTI.h"
 #include "io/WReaderELC.h"
 #include "io/WReaderFiberVTK.h"
-#include "io/WReaderLibeep.h"
 #include "io/WReaderVTK.h"
-#include "io/WPagerEEGLibeep.h"
+#ifdef WEEP_ENABLED
+    #include "io/WReaderLibeep.h"
+    #include "io/WPagerEEGLibeep.h"
+#endif
 #include "io/WReaderClustering.h"
 
 #include "WMData.h"
@@ -530,6 +532,7 @@ void WMData::load()
         WReaderEEGASCII eegAsciiLoader( fileName );
         m_dataSet = eegAsciiLoader.load();
     }
+#ifdef WEEP_ENABLED
     else if( suffix == ".cnt" )
     {
         boost::shared_ptr< WPagerEEG > pager( new WPagerEEGLibeep( fileName ) );
@@ -542,6 +545,7 @@ void WMData::load()
 
         m_dataSet = boost::shared_ptr< WEEG2 >( new WEEG2( pager, eegPositionsLibrary ) );
     }
+#endif
     else if( suffix == ".fib" )
     {
         WReaderFiberVTK fibReader( fileName );