diff --git a/invm-frameworks b/invm-frameworks
index 1682497..4866765 160000
--- a/invm-frameworks
+++ b/invm-frameworks
@@ -1 +1 @@
-Subproject commit 1682497379c9d0860a42139b3964665887456c47
+Subproject commit 4866765923823d140d0df876ecfe1910bf31252d
diff --git a/src/common/common_types.h b/src/common/common_types.h
index 45b34e3..33a7234 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -36,7 +36,7 @@
 #include <limits.h>
 #include "export_common.h"
 
-#ifdef __WINDOWS__
+#ifdef __MSVC__
 #include <stdlib.h>
 #define PATH_MAX _MAX_PATH
 #endif
diff --git a/src/lib/nvm_types.h b/src/lib/nvm_types.h
index 749a644..3fc2514 100644
--- a/src/lib/nvm_types.h
+++ b/src/lib/nvm_types.h
@@ -35,7 +35,7 @@
 #include <stddef.h>
 #include <limits.h>
 
-#ifdef _WIN32 
+#ifdef __MSVC__
 #include <stdlib.h>
 #define PATH_MAX _MAX_PATH
 #endif
diff --git a/src/lib/win_leg_adapter_shared.h b/src/lib/win_leg_adapter_shared.h
index 330f125..c6eb1cb 100644
--- a/src/lib/win_leg_adapter_shared.h
+++ b/src/lib/win_leg_adapter_shared.h
@@ -34,9 +34,11 @@
 #define	SRC_LIB_WIN_ADAPTER_H_
 
 #include <windows.h>
-#include <winioctl.h>
 #include <PrivateIoctlDefinitions.h>
 #include <device_fw.h>
+#ifdef __MSVC__
+#include <winioctl.h>
+#endif
 
 // SCSI port used as IOCTL target
 extern short g_scsi_port;
diff --git a/src/lib/win_scm2_adapter.c b/src/lib/win_scm2_adapter.c
index 29754a8..1c49f22 100644
--- a/src/lib/win_scm2_adapter.c
+++ b/src/lib/win_scm2_adapter.c
@@ -40,6 +40,7 @@
 #include <Setupapi.h>
 #include <GuidDef.h>
 #include <Devpkey.h>
+#include <devpropdef.h>
 #include <objbase.h>
 
 #define INITGUID