diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h
index db056814088..a8a2d8d601e 100644
--- a/sdk/include/xdk/iotypes.h
+++ b/sdk/include/xdk/iotypes.h
@@ -1216,6 +1216,9 @@ typedef enum {
   DevicePropertyAllocatedResources = 0x15,
   DevicePropertyContainerID = 0x16 | __string_type
 } DEVICE_REGISTRY_PROPERTY;
+#undef __string_type
+#undef __guid_type
+#undef __multiString_type
 
 typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
   EventCategoryReserved,