diff --git a/CMakeLists.txt b/CMakeLists.txt
index f114de7a0f064714bd43c89c95c3a951898e3ead..66b45977765716db13f1ce2bb46a7b953642ac97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,6 +181,11 @@ if( NOT ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_EXPORT )
 else( NOT ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC )
+	set( BUILD_SHARED_LIBS_TEMP ${BUILD_SHARED_LIBS} )
+	if( BUILD_SHARED_LIBS )
+		set( BUILD_SHARED_LIBS OFF )
+		message( "Ignoring activated BUILD_SHARED_LIBS temporary because static ITA core libs requested" )
+	endif( BUILD_SHARED_LIBS )
 endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
 
 
@@ -188,6 +193,8 @@ endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
 add_library( ITABase ${ITABaseHeader} ${ITABaseSources} )
 target_link_libraries( ITABase ${VISTA_USE_PACKAGE_LIBRARIES} )
 
+set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
+
 
 # configure
 vista_configure_lib( ITABase )
diff --git a/include/ITABaseDefinitions.h b/include/ITABaseDefinitions.h
index 318c07c2bbad1b211612deef49d1c86e7fa22217..c140476abbe758756e726318c59ed79a6be28139 100644
--- a/include/ITABaseDefinitions.h
+++ b/include/ITABaseDefinitions.h
@@ -1,20 +1,20 @@
 /*
-* ----------------------------------------------------------------
-*
-*		ITA core libs
-*		(c) Copyright Institute of Technical Acoustics (ITA)
-*		RWTH Aachen University, Germany, 2015-2016
-*
-* ----------------------------------------------------------------
-*				    ____  __________  _______
-*				   //  / //__   ___/ //  _   |
-*				  //  /    //  /    //  /_|  |
-*				 //  /    //  /    //  ___   |
-*				//__/    //__/    //__/   |__|
-*
-* ----------------------------------------------------------------
-*
-*/
+ * ----------------------------------------------------------------
+ *
+ *		ITA core libs
+ *		(c) Copyright Institute of Technical Acoustics (ITA)
+ *		RWTH Aachen University, Germany, 2015-2016
+ *
+ * ----------------------------------------------------------------
+ *				    ____  __________  _______
+ *				   //  / //__   ___/ //  _   |
+ *				  //  /    //  /    //  /_|  |
+ *				 //  /    //  /    //  ___   |
+ *				//__/    //__/    //__/   |__|
+ *
+ * ----------------------------------------------------------------
+ *
+ */
 
 #ifndef INCLUDE_WATCHER_ITA_BASE_DEFINITIONS
 #define INCLUDE_WATCHER_ITA_BASE_DEFINITIONS