4 files changed, 24 insertions, 4 deletions
diff --git a/libusbhp/Makefile.am b/libusbhp/Makefile.am
index 785a34d..e24a51f 100644
--- a/libusbhp/Makefile.am
+++ b/libusbhp/Makefile.am
@@ -8,3 +8,5 @@ libusbhp_la_SOURCES = \
 
 include_HEADERS = \
 	libusbhp.h
+
+EXTRA_DIST = libusbhp.vcxproj
+\ No newline at end of file
diff --git a/libusbhp/libusbhp.cc b/libusbhp/libusbhp.cc
index 9e79220..4058c10 100644
--- a/libusbhp/libusbhp.cc
+++ b/libusbhp/libusbhp.cc
@@ -28,7 +28,6 @@
 
 #ifdef __linux__
 #include <poll.h>
-#include <libudev.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,7 +52,13 @@
 
 #endif/*_WIN32*/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef __linux__
+#include <libudev.h>
+
 struct dev_list_t {
   char *path;
   unsigned short vid;
@@ -105,13 +110,13 @@ static void dev_list_add(struct libusbhp_t *h, const char *path,
 static int dev_list_remove(struct libusbhp_t *h, const char *path)
 {
   struct dev_list_t *p = h->devlist;
-  if(!p) return;
+  if(!p) return 1;
 
   if(!strcmp(p->path, path)) {
     h->devlist = p->next;
     free(p->path);
     free(p);
-    return;
+    return 0;
   }
 
   while(p->next) {
@@ -438,3 +443,7 @@ void libusbhp_register_hotplug_listeners(struct libusbhp_t *handle,
   handle->detach = disconnected_cb;
   handle->user_data = user_data;
 }
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/libusbhp/libusbhp.h b/libusbhp/libusbhp.h
index 2df287e..646f2ec 100644
--- a/libusbhp/libusbhp.h
+++ b/libusbhp/libusbhp.h
@@ -43,6 +43,11 @@
 #include <sys/time.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 struct libusbhp_t;
 
 struct libusbhp_device_t {
@@ -69,6 +74,9 @@ EXPORT
                                         libusbhp_hotplug_cb_fn disconnected_cb,
                                         void *user_data);
 
+#ifdef __cplusplus
+}
+#endif
 
 /***
 // Libusbx implementation:
diff --git a/libusbhp/libusbhp.vcxproj b/libusbhp/libusbhp.vcxproj
index fd5527c..6dca199 100644
--- a/libusbhp/libusbhp.vcxproj
+++ b/libusbhp/libusbhp.vcxproj
@@ -73,13 +73,14 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUSBHOTPLUG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUSBHOTPLUG_EXPORTS;BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />