diff --git a/app/secure_boot/secure_boot.c b/app/secure_boot/secure_boot.c
index bac48b047..aec4acedb 100644
--- a/app/secure_boot/secure_boot.c
+++ b/app/secure_boot/secure_boot.c
@@ -33,7 +33,6 @@
 #include "hal/atca_hal.h"
 #include "test/atca_test.h"
 #include "io_protection_key.h"
-#include "crypto_device_app.h"
 
 /*Initialization routines */
 static ATCA_STATUS secure_boot_init(secure_boot_parameters* secure_boot_params);
@@ -276,4 +275,4 @@ ATCA_STATUS bind_host_and_secure_element_with_io_protection(uint16_t slot)
     while (0);
 
     return status;
-}
\ No newline at end of file
+}
diff --git a/app/secure_boot/secure_boot.h b/app/secure_boot/secure_boot.h
index abdaebd5c..8c04460ce 100644
--- a/app/secure_boot/secure_boot.h
+++ b/app/secure_boot/secure_boot.h
@@ -36,7 +36,7 @@ extern "C" {
 #include "atca_status.h"
 #include "secure_boot_memory.h"
 #include "atca_command.h"
-#include "crypto\atca_crypto_sw_sha2.h"
+#include "crypto/atca_crypto_sw_sha2.h"
 #include "host/atca_host.h"
 
 
diff --git a/lib/atca_iface.h b/lib/atca_iface.h
index 8db967b32..e79fea0da 100644
--- a/lib/atca_iface.h
+++ b/lib/atca_iface.h
@@ -71,19 +71,19 @@ typedef struct
 
     union                           // each instance of an iface cfg defines a single type of interface
     {
-        struct ATCAI2C
+        struct
         {
             uint8_t  slave_address; // 8-bit slave address
             uint8_t  bus;           // logical i2c bus number, 0-based - HAL will map this to a pin pair for SDA SCL
             uint32_t baud;          // typically 400000
         } atcai2c;
 
-        struct ATCASWI
+        struct
         {
             uint8_t bus;        // logical SWI bus - HAL will map this to a pin	or uart port
         } atcaswi;
 
-        struct ATCAUART
+        struct
         {
             int      port;      // logic port number
             uint32_t baud;      // typically 115200
@@ -92,7 +92,7 @@ typedef struct
             uint8_t  stopbits;  // 0,1,2
         } atcauart;
 
-        struct ATCAHID
+        struct
         {
             int      idx;           // HID enumeration index
             uint32_t vid;           // Vendor ID of kit (0x03EB for CK101)
@@ -101,7 +101,7 @@ typedef struct
             uint8_t  guid[16];      // The GUID for this HID device
         } atcahid;
 
-        struct ATCACUSTOM
+        struct
         {
             ATCA_STATUS (*halinit)(void *hal, void *cfg);
             ATCA_STATUS (*halpostinit)(void *iface);