diff --git a/api/icsneolegacy/icsneolegacy.cpp b/api/icsneolegacy/icsneolegacy.cpp
index 7fea86a..29bb3d5 100644
--- a/api/icsneolegacy/icsneolegacy.cpp
+++ b/api/icsneolegacy/icsneolegacy.cpp
@@ -81,7 +81,7 @@ static bool NeoMessageToSpyMessage(const neodevice_t* device, const neomessage_t
 		copyStatusData();
 	};
 
-	switch (Network::Type(frame.type))
+	switch (frame.type)
 	{
 	case icsneo_msg_bus_type_can:
 	case icsneo_msg_bus_type_swcan:
diff --git a/include/icsneo/device/devicetype.h b/include/icsneo/device/devicetype.h
index 3db5305..216a9f0 100644
--- a/include/icsneo/device/devicetype.h
+++ b/include/icsneo/device/devicetype.h
@@ -5,9 +5,12 @@
 #define ICSNEO_DEVICETYPE_LONGEST_NAME (35 + 1) // Add 1 so that if someone forgets, they still have space for null terminator
 #define ICSNEO_DEVICETYPE_LONGEST_DESCRIPTION (ICSNEO_DEVICETYPE_LONGEST_NAME + 7) // 6 character serial, plus space
 
+
+#include <icsneo/icsneotypes.h>
+
+#ifdef __cplusplus
 #include <cstdint>
 #include <string>
-#include <icsneo/icsneotypes.h>
 
 
 namespace icsneo {
@@ -147,3 +150,5 @@ private:
 };
 
 }; // namespace icsneo
+
+#endif // __cplusplus
\ No newline at end of file