diff --git a/Modules/Core/ComponentInterface/include/ComponentBase.h b/Modules/Core/ComponentInterface/include/ComponentBase.h
index 28c65fe831dc9702e9944c9754f4b7c15a4affc1..c02e425702152b8b59b3eb152a96201632322b39 100644
--- a/Modules/Core/ComponentInterface/include/ComponentBase.h
+++ b/Modules/Core/ComponentInterface/include/ComponentBase.h
@@ -9,6 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <cstring>
 #include <map>
 
 namespace selx
diff --git a/Modules/Core/ComponentInterface/include/ComponentFactory.hxx b/Modules/Core/ComponentInterface/include/ComponentFactory.hxx
index 6e42a9c3ee341af1de6687ffac89757438363b39..f152a290dbec5ff13b7c2ade5ac495fe16828050 100644
--- a/Modules/Core/ComponentInterface/include/ComponentFactory.hxx
+++ b/Modules/Core/ComponentInterface/include/ComponentFactory.hxx
@@ -19,7 +19,7 @@
 //#include "itkMetricComponent1.h"
 #include "itkVersion.h"
 //#include "ComponentTraits.h"
-#include <typeinfo.h>
+#include <typeinfo>
 namespace selx
 {
 
diff --git a/Modules/Core/ComponentInterface/include/InterfaceTraits.h b/Modules/Core/ComponentInterface/include/InterfaceTraits.h
index 04ffcbb52dfcf4d9ceac5d01aecea440ccd1f61a..0333755f4d8014c918bbeb1a92be225af4dd732e 100644
--- a/Modules/Core/ComponentInterface/include/InterfaceTraits.h
+++ b/Modules/Core/ComponentInterface/include/InterfaceTraits.h
@@ -12,7 +12,7 @@ struct InterfaceName
 {
   static const char* Get()
   {
-    static_assert(false, "Please implement a template specialization for the appropriate InterfaceName")
+    //static_assert(false, "Please implement a template specialization for the appropriate InterfaceName");
     return typeid(T).name();
   }
 };
diff --git a/Modules/Core/ComponentInterface/include/Interfaces.h b/Modules/Core/ComponentInterface/include/Interfaces.h
index 99109fe371e48fdd577d6919a022b9c61e198e33..47938c2f66316599935a654af60cb596985c9a9f 100644
--- a/Modules/Core/ComponentInterface/include/Interfaces.h
+++ b/Modules/Core/ComponentInterface/include/Interfaces.h
@@ -3,6 +3,7 @@
 
 #include "ComponentBase.h"
 #include <typeinfo>
+#include <string>
 
 namespace selx
 {
diff --git a/Modules/Core/ComponentInterface/include/Interfaces.hxx b/Modules/Core/ComponentInterface/include/Interfaces.hxx
index b1ed905f2ce9b5dd7615813c16ab0818c3781b36..e54719b8b7cc5c8215b5de3c74967f888993454a 100644
--- a/Modules/Core/ComponentInterface/include/Interfaces.hxx
+++ b/Modules/Core/ComponentInterface/include/Interfaces.hxx
@@ -48,7 +48,7 @@ template<typename FirstInterface, typename ... RestInterfaces>
 ComponentBase::interfaceStatus Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(const char * interfacename, ComponentBase* other)
 {
   // does our component have an accepting interface called interfacename? 
-  if (0 ==std::strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
+  if (0 ==strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
   {
     // cast always succeeds since we know via the template arguments of the component which InterfaceAcceptors its base classes are.
     InterfaceAcceptor<FirstInterface>* acceptIF = this;
@@ -82,7 +82,7 @@ int Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(ComponentBase
 template<typename FirstInterface, typename ... RestInterfaces>
 bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename)
 {
-  if (0 == std::strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
+  if (0 == strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
   {
     return true;
   }
@@ -92,7 +92,7 @@ bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* int
 template<typename FirstInterface, typename ... RestInterfaces>
 bool Providing<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename)
 {
-  if (0 == std::strcmp(InterfaceName<FirstInterface>::Get(), interfacename))
+  if (0 == strcmp(InterfaceName<FirstInterface>::Get(), interfacename))
   {
     return true;
   }
diff --git a/Modules/Core/ModuleCore.cmake b/Modules/Core/ModuleCore.cmake
index b57854f03f07ffefa37fde7fd7c34c2aba27b74a..50b396b3a8ae300e02bc247f350fc9981df59d58 100644
--- a/Modules/Core/ModuleCore.cmake
+++ b/Modules/Core/ModuleCore.cmake
@@ -1,10 +1,5 @@
 set( MODULE ModuleCore )
 
-# Module source files
-set( ${MODULE}_SOURCE_FILES
-  ${${MODULE}_SOURCE_DIR}/Blueprints/src/elxBlueprint.cxx
-)
-
 # Export include files
 set( ${MODULE}_INCLUDE_DIRS
   ${${MODULE}_SOURCE_DIR}/Common/include