diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index ea895be..0bbee44 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -50,6 +50,8 @@ set_target_properties(idevice_ffi PROPERTIES
   IMPORTED_LOCATION "${IDEVICE_FFI_PATH}"
 )
 
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../ffi/idevice.h" "${CMAKE_CURRENT_SOURCE_DIR}/include" COPYONLY)
+
 # ---- Our C++ library -------------------------------------------------------
 
 # Collect sources (convenience: tracks new files when you re-run CMake)
diff --git a/cpp/src/diagnosticsservice.cpp b/cpp/src/diagnosticsservice.cpp
index 26aa91e..f67d866 100644
--- a/cpp/src/diagnosticsservice.cpp
+++ b/cpp/src/diagnosticsservice.cpp
@@ -1,6 +1,7 @@
 // Jackson Coxson
 
 #include <idevice++/diagnosticsservice.hpp>
+#include <cstring>
 
 namespace IdeviceFFI {