diff --git a/communication/message/callback/include/messagecallback.h b/communication/message/callback/include/messagecallback.h
index 9f80154..1ed7f62 100644
--- a/communication/message/callback/include/messagecallback.h
+++ b/communication/message/callback/include/messagecallback.h
@@ -4,6 +4,7 @@
 #include "communication/message/include/message.h"
 #include "communication/message/filter/include/messagefilter.h"
 #include <memory>
+#include <functional>
 
 namespace icsneo {
 
diff --git a/device/include/idevicesettings.h b/device/include/idevicesettings.h
index cf29087..5a3f2d5 100644
--- a/device/include/idevicesettings.h
+++ b/device/include/idevicesettings.h
@@ -277,16 +277,16 @@ typedef struct _UART_SETTINGS
 	uint16_t stop_bits;
 	uint8_t flow_control; /* 0- off, 1 - Simple CTS RTS */
 	uint8_t reserved_1;
-	union {
+	union abcd {
 		uint32_t bOptions;
-		struct sOptions
+		struct _sOptions
 		{
 			unsigned invert_tx : 1;
 			unsigned invert_rx : 1;
 			unsigned half_duplex : 1;
 			unsigned reserved_bits : 13;
 			unsigned reserved_bits2 : 16;
-		};
+		} sOptions;
 	};
 } UART_SETTINGS;
 #define UART_SETTINGS_SIZE 16