diff --git a/Modules/US/USHardwareEpiphan/CMakeLists.txt b/Modules/US/USHardwareEpiphan/CMakeLists.txt
index 4e0bfbe4f1..f64e683000 100644
--- a/Modules/US/USHardwareEpiphan/CMakeLists.txt
+++ b/Modules/US/USHardwareEpiphan/CMakeLists.txt
@@ -1,31 +1,31 @@
 option(MITK_USE_EPIPHAN_SDK "Enable support for Epiphan devices" OFF)
 
 if(MITK_USE_EPIPHAN_SDK)
 
 set(MITK_EPIPHAN_SDK_PATH CACHE PATH "")
 
 if(MITK_EPIPHAN_SDK_PATH)
 
 find_library(MITK_EPIPHAN_FRMGRAB_LIBRARY frmgrab ${MITK_EPIPHAN_SDK_PATH}/frmgrab/lib/win/x64/ "Path which contains the Epiphan frmgrab.lib library.")
 find_path(MITK_EPIPHAN_INCLUDE_DIR v2u_defs.h ${MITK_EPIPHAN_SDK_PATH}/include  "Include directory of the Epiphan library.")
 find_path(MITK_EPIPHAN_FRMGRAB_INCLUDE_DIR frmgrab.h ${MITK_EPIPHAN_SDK_PATH}/frmgrab/include  "Include directory of the Epiphan frmgrab library.")
 #set(MITK_EPIPHAN_INCLUDE_DIR ${MITK_EPIPHAN_SDK_PATH}/include)
 #set(MITK_EPIPHAN_FRMGRAB_INCLUDE_DIR ${MITK_EPIPHAN_SDK_PATH}/frmgrab/include)
 #set(MITK_EPIPHAN_FRMGRAB_LIBRARY ${MITK_EPIPHAN_SDK_PATH}/frmgrab/lib/win/x64/frmgrab.lib)
 
-MITK_CREATE_MODULE(
+mitk_create_module(
   SUBPROJECTS
   DEPENDS MitkUS
-  INCLUDE_DIRS ${MITK_EPIPHAN_INCLUDE_DIR} ${MITK_EPIPHAN_FRMGRAB_INCLUDE_DIR}
+  INCLUDE_DIRS PUBLIC ${MITK_EPIPHAN_INCLUDE_DIR} ${MITK_EPIPHAN_FRMGRAB_INCLUDE_DIR}
   ADDITIONAL_LIBS ${MITK_EPIPHAN_FRMGRAB_LIBRARY}
-  AUTOLOAD_WITH MitkUS
+  #AUTOLOAD_WITH MitkUS
 )
 
 else()
 
 message(FATAL_ERROR "Please set the Epiphan SDK root path (MITK_EPIPHAN_SDK_PATH).")
 
 endif()
 
 endif()
 
diff --git a/Modules/US/USHardwareEpiphan/mitkUSEpiphanImageSource.h b/Modules/US/USHardwareEpiphan/mitkUSEpiphanImageSource.h
index 296f53998b..baaea3399f 100644
--- a/Modules/US/USHardwareEpiphan/mitkUSEpiphanImageSource.h
+++ b/Modules/US/USHardwareEpiphan/mitkUSEpiphanImageSource.h
@@ -1,49 +1,48 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKUSEpiphanImageSource_H_HEADER_INCLUDED_
 #define MITKUSEpiphanImageSource_H_HEADER_INCLUDED_
 
-#include "mitkUSImageSource.h"
 #include "frmgrab.h"
+#include "mitkUSImageSource.h"
+#include <MitkUSHardwareEpiphanExports.h>
 
 namespace mitk
 {
   /**
    * \brief Implementation of mitk::USImageSource for Epiphan API devices.
    */
-  class USEpiphanImageSource : public USImageSource
+  class MITKUSHARDWAREEPIPHAN_EXPORT USEpiphanImageSource : public USImageSource
   {
   public:
     mitkClassMacro(USEpiphanImageSource, USImageSource) itkFactorylessNewMacro(Self) itkCloneMacro(Self)
 
       void GetNextRawImage(std::vector<mitk::Image::Pointer> &);
-    
+
     void StartGrabbing();
 
     void StopGrabbing();
 
-      FrmGrabber *m_FrameGrabber;
+    FrmGrabber *m_FrameGrabber;
 
   protected:
     USEpiphanImageSource();
     virtual ~USEpiphanImageSource();
-
-
   };
 } // namespace mitk
 
 #endif // MITKUSEpiphanImageSource_H