diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cfbcd7c..901d260e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,23 +15,10 @@ set(ETL_PROFILE "DEFAULT" CACHE STRING "Defines what profile header to include.
 
 option(BUILD_TESTS "Build unit tests" OFF)
 
+add_library(etl INTERFACE)
 
-# Note: this will not compile src/c/ecl_timer.c as that c file has a dependence
-#       on ecl_user.h which is provided by clients of this library 
-add_library(etl STATIC
-  src/binary.cpp
-  src/crc16.cpp
-  src/crc16_ccitt.cpp
-  src/crc16_kermit.cpp
-  src/crc32.cpp
-  src/crc64_ecma.cpp
-  src/crc8_ccitt.cpp
-  src/error_handler.cpp
-  src/pearson.cpp
-  src/random.cpp
-  )
 target_include_directories(etl
-  PUBLIC
+  INTERFACE
   include
   include/etl/profiles
   )
@@ -60,7 +47,7 @@ endif()
 message(STATUS "Compiling with ETL profile set to: ${ETL_PROFILE}")
 
 target_compile_definitions(etl
-  PUBLIC
+  INTERFACE
   ${ETL_PROFILE} 
   )
 
diff --git a/include/etl/private/pvoidvector.h b/include/etl/private/pvoidvector.h
index 3b735331..474e2d19 100644
--- a/include/etl/private/pvoidvector.h
+++ b/include/etl/private/pvoidvector.h
@@ -45,7 +45,6 @@ SOFTWARE.
 #include "../stl/iterator.h"
 
 #ifdef ETL_COMPILER_GCC
-#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
@@ -647,10 +646,6 @@ namespace etl
 
 #include "minmax_pop.h"
 
-#ifdef ETL_COMPILER_GCC
-#pragma GCC diagnostic pop
-#endif
-
 #undef ETL_IN_PVOIDVECTOR
 
 #endif
diff --git a/include/etl/state_chart.h b/include/etl/state_chart.h
index b99674cf..4602a882 100644
--- a/include/etl/state_chart.h
+++ b/include/etl/state_chart.h
@@ -242,7 +242,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// 
+    ///
     //*************************************************************************
     void start(const bool on_entry_initial = true)
     {