diff --git a/IO.cpp b/IO.cpp
index 58870c5..854dc0c 100644
--- a/IO.cpp
+++ b/IO.cpp
@@ -20,8 +20,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "Streams.hpp"
 #include <iostream>
 #include <unistd.h>
-//#include <sys/ioctl.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -31,6 +29,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "u2f.hpp"
 #include "Macro.hpp"
 #include "U2FDevice.hpp"
+#include <array>
 
 using namespace std;
 
diff --git a/Scripts/cpp-base64-CMakeLists.txt b/Scripts/cpp-base64-CMakeLists.txt
new file mode 100644
index 0000000..f26bd81
--- /dev/null
+++ b/Scripts/cpp-base64-CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+set(CMAKE_C_FLAGS, "${CMAKE_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Werror")
+
+add_library(cppb64 STATIC base64.cpp)
diff --git a/Scripts/uECC-CMakeLists.txt b/Scripts/uECC-CMakeLists.txt
new file mode 100644
index 0000000..f07c7f2
--- /dev/null
+++ b/Scripts/uECC-CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+set(CMAKE_C_FLAGS, "${CMAKE_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Werror")
+
+add_library(uECC STATIC uECC.c)