diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 3105725..be8986b 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11577
+#define LIBUSB_NANO 11578
diff --git a/msvc/fxload_2013.vcxproj b/msvc/fxload_2013.vcxproj
index 2419fe9..6b7cebd 100644
--- a/msvc/fxload_2013.vcxproj
+++ b/msvc/fxload_2013.vcxproj
@@ -74,7 +74,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include=".\getopt\getopt.h" />
     <ClInclude Include="..\examples\ezusb.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include=".\getopt_2013.vcxproj">
diff --git a/msvc/fxload_2013.vcxproj.filters b/msvc/fxload_2013.vcxproj.filters
index fa1bb78..2129604 100644
--- a/msvc/fxload_2013.vcxproj.filters
+++ b/msvc/fxload_2013.vcxproj.filters
@@ -14,9 +14,15 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include=".\getopt\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\examples\ezusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\ezusb.c">
diff --git a/msvc/fxload_2015.vcxproj b/msvc/fxload_2015.vcxproj
index 9e8ae62..01c12b3 100644
--- a/msvc/fxload_2015.vcxproj
+++ b/msvc/fxload_2015.vcxproj
@@ -74,7 +74,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include=".\getopt\getopt.h" />
     <ClInclude Include="..\examples\ezusb.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include=".\getopt_2015.vcxproj">
diff --git a/msvc/fxload_2015.vcxproj.filters b/msvc/fxload_2015.vcxproj.filters
index fa1bb78..2129604 100644
--- a/msvc/fxload_2015.vcxproj.filters
+++ b/msvc/fxload_2015.vcxproj.filters
@@ -14,9 +14,15 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include=".\getopt\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\examples\ezusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\ezusb.c">
diff --git a/msvc/fxload_2017.vcxproj b/msvc/fxload_2017.vcxproj
index 9db5072..c8186ef 100644
--- a/msvc/fxload_2017.vcxproj
+++ b/msvc/fxload_2017.vcxproj
@@ -93,7 +93,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include=".\getopt\getopt.h" />
     <ClInclude Include="..\examples\ezusb.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include=".\getopt_2017.vcxproj">
diff --git a/msvc/fxload_2017.vcxproj.filters b/msvc/fxload_2017.vcxproj.filters
index fa1bb78..2129604 100644
--- a/msvc/fxload_2017.vcxproj.filters
+++ b/msvc/fxload_2017.vcxproj.filters
@@ -14,9 +14,15 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include=".\getopt\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\examples\ezusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\ezusb.c">
diff --git a/msvc/fxload_2019.vcxproj b/msvc/fxload_2019.vcxproj
index 7a98720..9e32da6 100644
--- a/msvc/fxload_2019.vcxproj
+++ b/msvc/fxload_2019.vcxproj
@@ -93,7 +93,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include=".\getopt\getopt.h" />
     <ClInclude Include="..\examples\ezusb.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include=".\getopt_2019.vcxproj">
diff --git a/msvc/fxload_2019.vcxproj.filters b/msvc/fxload_2019.vcxproj.filters
index fa1bb78..2129604 100644
--- a/msvc/fxload_2019.vcxproj.filters
+++ b/msvc/fxload_2019.vcxproj.filters
@@ -14,9 +14,15 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include=".\getopt\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\examples\ezusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\ezusb.c">
diff --git a/msvc/hotplugtest_2013.vcxproj b/msvc/hotplugtest_2013.vcxproj
index 4e71963..2fad4a7 100644
--- a/msvc/hotplugtest_2013.vcxproj
+++ b/msvc/hotplugtest_2013.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\hotplugtest.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2013.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/hotplugtest_2013.vcxproj.filters b/msvc/hotplugtest_2013.vcxproj.filters
index 93c5f9a..6228bd3 100644
--- a/msvc/hotplugtest_2013.vcxproj.filters
+++ b/msvc/hotplugtest_2013.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2499509b-af28-4409-aed1-a0c3cc458288}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6fa5acdf-d7e4-48e3-a554-9000deb594d1}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\hotplugtest.c">
diff --git a/msvc/hotplugtest_2015.vcxproj b/msvc/hotplugtest_2015.vcxproj
index 4af9f30..9a56aee 100644
--- a/msvc/hotplugtest_2015.vcxproj
+++ b/msvc/hotplugtest_2015.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\hotplugtest.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2015.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/hotplugtest_2015.vcxproj.filters b/msvc/hotplugtest_2015.vcxproj.filters
index 93c5f9a..6228bd3 100644
--- a/msvc/hotplugtest_2015.vcxproj.filters
+++ b/msvc/hotplugtest_2015.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2499509b-af28-4409-aed1-a0c3cc458288}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6fa5acdf-d7e4-48e3-a554-9000deb594d1}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\hotplugtest.c">
diff --git a/msvc/hotplugtest_2017.vcxproj b/msvc/hotplugtest_2017.vcxproj
index 9342d7d..ca383d3 100644
--- a/msvc/hotplugtest_2017.vcxproj
+++ b/msvc/hotplugtest_2017.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\hotplugtest.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2017.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/hotplugtest_2017.vcxproj.filters b/msvc/hotplugtest_2017.vcxproj.filters
index 93c5f9a..6228bd3 100644
--- a/msvc/hotplugtest_2017.vcxproj.filters
+++ b/msvc/hotplugtest_2017.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2499509b-af28-4409-aed1-a0c3cc458288}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6fa5acdf-d7e4-48e3-a554-9000deb594d1}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\hotplugtest.c">
diff --git a/msvc/hotplugtest_2019.vcxproj b/msvc/hotplugtest_2019.vcxproj
index 9adec6b..d65bb6f 100644
--- a/msvc/hotplugtest_2019.vcxproj
+++ b/msvc/hotplugtest_2019.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\hotplugtest.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2019.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/hotplugtest_2019.vcxproj.filters b/msvc/hotplugtest_2019.vcxproj.filters
index 93c5f9a..6228bd3 100644
--- a/msvc/hotplugtest_2019.vcxproj.filters
+++ b/msvc/hotplugtest_2019.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2499509b-af28-4409-aed1-a0c3cc458288}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6fa5acdf-d7e4-48e3-a554-9000deb594d1}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\hotplugtest.c">
diff --git a/msvc/listdevs_2013.vcxproj b/msvc/listdevs_2013.vcxproj
index 99b364a..08c0a3f 100644
--- a/msvc/listdevs_2013.vcxproj
+++ b/msvc/listdevs_2013.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\listdevs.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2013.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/listdevs_2013.vcxproj.filters b/msvc/listdevs_2013.vcxproj.filters
index c33708f..895e2bc 100644
--- a/msvc/listdevs_2013.vcxproj.filters
+++ b/msvc/listdevs_2013.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2ceecece-c641-4d87-8e75-ea3622a2a50c}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6162aa6f-aa3a-43b0-92b2-f40207a0b581}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\listdevs.c">
diff --git a/msvc/listdevs_2015.vcxproj b/msvc/listdevs_2015.vcxproj
index f259d12..7791894 100644
--- a/msvc/listdevs_2015.vcxproj
+++ b/msvc/listdevs_2015.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\listdevs.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2015.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/listdevs_2015.vcxproj.filters b/msvc/listdevs_2015.vcxproj.filters
index c33708f..895e2bc 100644
--- a/msvc/listdevs_2015.vcxproj.filters
+++ b/msvc/listdevs_2015.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2ceecece-c641-4d87-8e75-ea3622a2a50c}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6162aa6f-aa3a-43b0-92b2-f40207a0b581}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\listdevs.c">
diff --git a/msvc/listdevs_2017.vcxproj b/msvc/listdevs_2017.vcxproj
index 9f10864..f7ae424 100644
--- a/msvc/listdevs_2017.vcxproj
+++ b/msvc/listdevs_2017.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\listdevs.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2017.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/listdevs_2017.vcxproj.filters b/msvc/listdevs_2017.vcxproj.filters
index c33708f..895e2bc 100644
--- a/msvc/listdevs_2017.vcxproj.filters
+++ b/msvc/listdevs_2017.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2ceecece-c641-4d87-8e75-ea3622a2a50c}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6162aa6f-aa3a-43b0-92b2-f40207a0b581}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\listdevs.c">
diff --git a/msvc/listdevs_2019.vcxproj b/msvc/listdevs_2019.vcxproj
index b414615..cbb97cf 100644
--- a/msvc/listdevs_2019.vcxproj
+++ b/msvc/listdevs_2019.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\listdevs.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2019.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/listdevs_2019.vcxproj.filters b/msvc/listdevs_2019.vcxproj.filters
index c33708f..895e2bc 100644
--- a/msvc/listdevs_2019.vcxproj.filters
+++ b/msvc/listdevs_2019.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{2ceecece-c641-4d87-8e75-ea3622a2a50c}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6162aa6f-aa3a-43b0-92b2-f40207a0b581}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\listdevs.c">
diff --git a/msvc/stress_2013.vcxproj b/msvc/stress_2013.vcxproj
index cc762cc..2d5a3c1 100644
--- a/msvc/stress_2013.vcxproj
+++ b/msvc/stress_2013.vcxproj
@@ -74,6 +74,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
     <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/stress_2013.vcxproj.filters b/msvc/stress_2013.vcxproj.filters
index 51b38c8..9c867ea 100644
--- a/msvc/stress_2013.vcxproj.filters
+++ b/msvc/stress_2013.vcxproj.filters
@@ -14,6 +14,9 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\tests\libusb_testlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/msvc/stress_2015.vcxproj b/msvc/stress_2015.vcxproj
index 21d42ef..dc1d1d2 100644
--- a/msvc/stress_2015.vcxproj
+++ b/msvc/stress_2015.vcxproj
@@ -74,6 +74,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
     <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/stress_2015.vcxproj.filters b/msvc/stress_2015.vcxproj.filters
index 51b38c8..9c867ea 100644
--- a/msvc/stress_2015.vcxproj.filters
+++ b/msvc/stress_2015.vcxproj.filters
@@ -14,6 +14,9 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\tests\libusb_testlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/msvc/stress_2017.vcxproj b/msvc/stress_2017.vcxproj
index 064f21d..9d412db 100644
--- a/msvc/stress_2017.vcxproj
+++ b/msvc/stress_2017.vcxproj
@@ -93,6 +93,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
     <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/stress_2017.vcxproj.filters b/msvc/stress_2017.vcxproj.filters
index 51b38c8..9c867ea 100644
--- a/msvc/stress_2017.vcxproj.filters
+++ b/msvc/stress_2017.vcxproj.filters
@@ -14,6 +14,9 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\tests\libusb_testlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/msvc/stress_2019.vcxproj b/msvc/stress_2019.vcxproj
index 0eed3cc..d9ca666 100644
--- a/msvc/stress_2019.vcxproj
+++ b/msvc/stress_2019.vcxproj
@@ -93,6 +93,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
+    <ClInclude Include="..\libusb\libusb.h" />
     <ClInclude Include="..\tests\libusb_testlib.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/stress_2019.vcxproj.filters b/msvc/stress_2019.vcxproj.filters
index 51b38c8..9c867ea 100644
--- a/msvc/stress_2019.vcxproj.filters
+++ b/msvc/stress_2019.vcxproj.filters
@@ -14,6 +14,9 @@
     <ClInclude Include=".\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\tests\libusb_testlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/msvc/testlibusb_2013.vcxproj b/msvc/testlibusb_2013.vcxproj
index 0117503..dd7f1b6 100644
--- a/msvc/testlibusb_2013.vcxproj
+++ b/msvc/testlibusb_2013.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\testlibusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2013.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/testlibusb_2013.vcxproj.filters b/msvc/testlibusb_2013.vcxproj.filters
index 9db38ab..d655f83 100644
--- a/msvc/testlibusb_2013.vcxproj.filters
+++ b/msvc/testlibusb_2013.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4a89b408-009b-41e4-bb05-78f07a7c7f82}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{9dc8bfc2-c1d0-41d9-9fd2-858137d5d7c7}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\testlibusb.c">
diff --git a/msvc/testlibusb_2015.vcxproj b/msvc/testlibusb_2015.vcxproj
index 1cf7ee4..c2f356b 100644
--- a/msvc/testlibusb_2015.vcxproj
+++ b/msvc/testlibusb_2015.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\testlibusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2015.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/testlibusb_2015.vcxproj.filters b/msvc/testlibusb_2015.vcxproj.filters
index 9db38ab..d655f83 100644
--- a/msvc/testlibusb_2015.vcxproj.filters
+++ b/msvc/testlibusb_2015.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4a89b408-009b-41e4-bb05-78f07a7c7f82}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{9dc8bfc2-c1d0-41d9-9fd2-858137d5d7c7}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\testlibusb.c">
diff --git a/msvc/testlibusb_2017.vcxproj b/msvc/testlibusb_2017.vcxproj
index 029e3bd..c7cbc84 100644
--- a/msvc/testlibusb_2017.vcxproj
+++ b/msvc/testlibusb_2017.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\testlibusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2017.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/testlibusb_2017.vcxproj.filters b/msvc/testlibusb_2017.vcxproj.filters
index 9db38ab..d655f83 100644
--- a/msvc/testlibusb_2017.vcxproj.filters
+++ b/msvc/testlibusb_2017.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4a89b408-009b-41e4-bb05-78f07a7c7f82}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{9dc8bfc2-c1d0-41d9-9fd2-858137d5d7c7}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\testlibusb.c">
diff --git a/msvc/testlibusb_2019.vcxproj b/msvc/testlibusb_2019.vcxproj
index d7a54b2..896d4fb 100644
--- a/msvc/testlibusb_2019.vcxproj
+++ b/msvc/testlibusb_2019.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\testlibusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2019.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/testlibusb_2019.vcxproj.filters b/msvc/testlibusb_2019.vcxproj.filters
index 9db38ab..d655f83 100644
--- a/msvc/testlibusb_2019.vcxproj.filters
+++ b/msvc/testlibusb_2019.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4a89b408-009b-41e4-bb05-78f07a7c7f82}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{9dc8bfc2-c1d0-41d9-9fd2-858137d5d7c7}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\testlibusb.c">
diff --git a/msvc/xusb_2013.vcxproj b/msvc/xusb_2013.vcxproj
index df27d9c..ba9cd72 100644
--- a/msvc/xusb_2013.vcxproj
+++ b/msvc/xusb_2013.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\xusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2013.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/xusb_2013.vcxproj.filters b/msvc/xusb_2013.vcxproj.filters
index e29356d..30dca26 100644
--- a/msvc/xusb_2013.vcxproj.filters
+++ b/msvc/xusb_2013.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4bdcefa9-8c79-431b-965b-15b234737380}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f81e24cd-e12b-4324-ada3-accbab00ef08}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\xusb.c">
diff --git a/msvc/xusb_2015.vcxproj b/msvc/xusb_2015.vcxproj
index ab88230..1b5d944 100644
--- a/msvc/xusb_2015.vcxproj
+++ b/msvc/xusb_2015.vcxproj
@@ -72,6 +72,9 @@
     <ClCompile Include="..\examples\xusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2015.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/xusb_2015.vcxproj.filters b/msvc/xusb_2015.vcxproj.filters
index e29356d..30dca26 100644
--- a/msvc/xusb_2015.vcxproj.filters
+++ b/msvc/xusb_2015.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4bdcefa9-8c79-431b-965b-15b234737380}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f81e24cd-e12b-4324-ada3-accbab00ef08}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\xusb.c">
diff --git a/msvc/xusb_2017.vcxproj b/msvc/xusb_2017.vcxproj
index 30be16c..4526d94 100644
--- a/msvc/xusb_2017.vcxproj
+++ b/msvc/xusb_2017.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\xusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2017.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/xusb_2017.vcxproj.filters b/msvc/xusb_2017.vcxproj.filters
index e29356d..30dca26 100644
--- a/msvc/xusb_2017.vcxproj.filters
+++ b/msvc/xusb_2017.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4bdcefa9-8c79-431b-965b-15b234737380}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f81e24cd-e12b-4324-ada3-accbab00ef08}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\xusb.c">
diff --git a/msvc/xusb_2019.vcxproj b/msvc/xusb_2019.vcxproj
index 44a165f..d61b0cb 100644
--- a/msvc/xusb_2019.vcxproj
+++ b/msvc/xusb_2019.vcxproj
@@ -91,6 +91,9 @@
     <ClCompile Include="..\examples\xusb.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include=".\libusb_static_2019.vcxproj">
       <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/msvc/xusb_2019.vcxproj.filters b/msvc/xusb_2019.vcxproj.filters
index e29356d..30dca26 100644
--- a/msvc/xusb_2019.vcxproj.filters
+++ b/msvc/xusb_2019.vcxproj.filters
@@ -5,6 +5,15 @@
       <UniqueIdentifier>{4bdcefa9-8c79-431b-965b-15b234737380}</UniqueIdentifier>
       <Extensions>c</Extensions>
     </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f81e24cd-e12b-4324-ada3-accbab00ef08}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libusb\libusb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\examples\xusb.c">