diff --git a/CMake/BuildConfigurations/All.cmake b/CMake/BuildConfigurations/All.cmake
index faef8b4af1..4db45f564d 100644
--- a/CMake/BuildConfigurations/All.cmake
+++ b/CMake/BuildConfigurations/All.cmake
@@ -1,57 +1,55 @@
 set(MITK_CONFIG_PACKAGES )
 
 set(_apple_package_excludes)
 
 if(APPLE)
   set(_apple_package_excludes
     SOFA
   )
 endif()
 
 set(_package_excludes
   ${_apple_package_excludes}
   Python
   OpenCL
   SYSTEM_Boost
   Boost_LIBRARIES
   SYSTEM_PYTHON
   SOFA_PLUGINS
   SOFA_PLUGINS_DIR
   SUPERBUILD
 
   KWSTYLE
   MICROBIRD_TRACKER
   MICROBIRD_TRACKER_INCLUDE_DIR
   MICROBIRD_TRACKER_LIB
   MICRON_TRACKER
   OPTITRACK_TRACKER
   SPACENAVIGATOR
   TOF_KINECT
   TOF_KINECTV2
   TOF_MESASR4000
   TOF_PMDCAMBOARD
   TOF_PMDCAMCUBE
   TOF_PMDO3
   US_TELEMED_SDK
   videoInput
   WIIMOTE
-  HDF5
-  Vigra
 )
 
 get_cmake_property(_cache_vars CACHE_VARIABLES)
 foreach(_cache_var ${_cache_vars})
   string(REGEX REPLACE "MITK_USE_(.+)" "\\1" _package "${_cache_var}")
   if(_package AND NOT _package STREQUAL _cache_var)
     list(FIND _package_excludes ${_package} _index)
     if(_index EQUAL -1)
       list(APPEND MITK_CONFIG_PACKAGES ${_package})
     endif()
   endif()
 endforeach()
 
 set(MITK_BUILD_ALL_APPS ON CACHE BOOL "Build all MITK applications" FORCE)
 set(MITK_BUILD_ALL_PLUGINS ON CACHE BOOL "Build all MITK plugins" FORCE)
 set(MITK_BUILD_EXAMPLES ON CACHE BOOL "Build the MITK examples" FORCE)
 set(BLUEBERRY_BUILD_ALL_PLUGINS ON CACHE BOOL "Build all BlueBerry plugins" FORCE)
 set(BUILD_DiffusionMiniApps ON CACHE BOOL "Build MITK Diffusion MiniApps" FORCE)
diff --git a/CMakeExternals/ITK.cmake b/CMakeExternals/ITK.cmake
index d1246e6da5..cff78a2478 100644
--- a/CMakeExternals/ITK.cmake
+++ b/CMakeExternals/ITK.cmake
@@ -1,84 +1,90 @@
 #-----------------------------------------------------------------------------
 # ITK
 #-----------------------------------------------------------------------------
 
 # Sanity checks
 if(DEFINED ITK_DIR AND NOT EXISTS ${ITK_DIR})
   message(FATAL_ERROR "ITK_DIR variable is defined but corresponds to non-existing directory")
 endif()
 
 set(proj ITK)
 set(proj_DEPENDENCIES GDCM)
 
 if(MITK_USE_OpenCV)
   list(APPEND proj_DEPENDENCIES OpenCV)
 endif()
 
 if(MITK_USE_HDF5)
   list(APPEND proj_DEPENDENCIES HDF5)
 endif()
 
 set(ITK_DEPENDS ${proj})
 
 if(NOT DEFINED ITK_DIR)
 
   set(additional_cmake_args )
   if(MINGW)
     set(additional_cmake_args
         -DCMAKE_USE_WIN32_THREADS:BOOL=ON
         -DCMAKE_USE_PTHREADS:BOOL=OFF)
   endif()
 
   list(APPEND additional_cmake_args
        -DUSE_WRAP_ITK:BOOL=OFF
       )
 
   if(MITK_USE_OpenCV)
     list(APPEND additional_cmake_args
          -DModule_ITKVideoBridgeOpenCV:BOOL=ON
          -DOpenCV_DIR:PATH=${OpenCV_DIR}
         )
   endif()
 
   # Keep the behaviour of ITK 4.3 which by default turned on ITK Review
   # see MITK bug #17338
   list(APPEND additional_cmake_args
     -DModule_ITKReview:BOOL=ON
   # for 4.7, the OpenJPEG is needed by review but the variable must be set
     -DModule_ITKOpenJPEG:BOOL=ON
   )
 
   set(vcl_constexpr_patch)
   if(GCC_VERSION VERSION_LESS 4.7 AND GCC_VERSION VERSION_GREATER 4)
     set(vcl_constexpr_patch
       COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/ITK-4.5.1-gcc-4.6.patch
     )
   endif()
 
+  if(MITK_USE_HDF5 AND WIN32)
+    list(APPEND additional_cmake_args
+      -DHDF5_C_LIBRARY:FILEPATH=${ep_prefix}/lib/hdf5.lib
+      -DHDF5_CXX_LIBRARY:FILEPATH=${ep_prefix}/lib/hdf5_cpp.lib)
+  endif()
+
   ExternalProject_Add(${proj}
      LIST_SEPARATOR ${sep}
      URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/InsightToolkit-4.7.1-20c0592.tar.gz
      URL_MD5 f778a5f0e297c06dc629c33ec45733dc
      # work with external GDCM
      PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/ITK-4.5.1.patch
                    ${vcl_constexpr_patch}
      CMAKE_GENERATOR ${gen}
      CMAKE_ARGS
        ${ep_common_args}
        ${additional_cmake_args}
        -DBUILD_EXAMPLES:BOOL=OFF
        -DITK_USE_SYSTEM_GDCM:BOOL=ON
        -DGDCM_DIR:PATH=${GDCM_DIR}
-       -DITK_USE_SYSTEM_HDF5:BOOL=${MITK_USE_HDF5}
        -DHDF5_DIR:PATH=${HDF5_DIR}
+       -DITK_USE_SYSTEM_HDF5:BOOL=${MITK_USE_HDF5}
      DEPENDS ${proj_DEPENDENCIES}
     )
 
   set(ITK_DIR ${ep_prefix})
   mitkFunctionInstallExternalCMakeProject(${proj})
 
 else()
 
   mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
 endif()