diff --git a/windows/vs2010/include/config.h b/windows/include/config.h
similarity index 100%
rename from windows/vs2010/include/config.h
rename to windows/include/config.h
diff --git a/windows/vs2010/include/jansson.h b/windows/include/jansson.h
similarity index 100%
rename from windows/vs2010/include/jansson.h
rename to windows/include/jansson.h
diff --git a/windows/vs2010/include/jansson_config.h b/windows/include/jansson_config.h
similarity index 100%
rename from windows/vs2010/include/jansson_config.h
rename to windows/include/jansson_config.h
diff --git a/windows/vs2010/include/openssl/aes.h b/windows/include/openssl/aes.h
similarity index 100%
rename from windows/vs2010/include/openssl/aes.h
rename to windows/include/openssl/aes.h
diff --git a/windows/vs2010/include/openssl/asn1.h b/windows/include/openssl/asn1.h
similarity index 100%
rename from windows/vs2010/include/openssl/asn1.h
rename to windows/include/openssl/asn1.h
diff --git a/windows/vs2010/include/openssl/asn1_mac.h b/windows/include/openssl/asn1_mac.h
similarity index 100%
rename from windows/vs2010/include/openssl/asn1_mac.h
rename to windows/include/openssl/asn1_mac.h
diff --git a/windows/vs2010/include/openssl/asn1t.h b/windows/include/openssl/asn1t.h
similarity index 100%
rename from windows/vs2010/include/openssl/asn1t.h
rename to windows/include/openssl/asn1t.h
diff --git a/windows/vs2010/include/openssl/bio.h b/windows/include/openssl/bio.h
similarity index 100%
rename from windows/vs2010/include/openssl/bio.h
rename to windows/include/openssl/bio.h
diff --git a/windows/vs2010/include/openssl/blowfish.h b/windows/include/openssl/blowfish.h
similarity index 100%
rename from windows/vs2010/include/openssl/blowfish.h
rename to windows/include/openssl/blowfish.h
diff --git a/windows/vs2010/include/openssl/bn.h b/windows/include/openssl/bn.h
similarity index 100%
rename from windows/vs2010/include/openssl/bn.h
rename to windows/include/openssl/bn.h
diff --git a/windows/vs2010/include/openssl/buffer.h b/windows/include/openssl/buffer.h
similarity index 100%
rename from windows/vs2010/include/openssl/buffer.h
rename to windows/include/openssl/buffer.h
diff --git a/windows/vs2010/include/openssl/camellia.h b/windows/include/openssl/camellia.h
similarity index 100%
rename from windows/vs2010/include/openssl/camellia.h
rename to windows/include/openssl/camellia.h
diff --git a/windows/vs2010/include/openssl/cast.h b/windows/include/openssl/cast.h
similarity index 100%
rename from windows/vs2010/include/openssl/cast.h
rename to windows/include/openssl/cast.h
diff --git a/windows/vs2010/include/openssl/cmac.h b/windows/include/openssl/cmac.h
similarity index 100%
rename from windows/vs2010/include/openssl/cmac.h
rename to windows/include/openssl/cmac.h
diff --git a/windows/vs2010/include/openssl/cms.h b/windows/include/openssl/cms.h
similarity index 100%
rename from windows/vs2010/include/openssl/cms.h
rename to windows/include/openssl/cms.h
diff --git a/windows/vs2010/include/openssl/comp.h b/windows/include/openssl/comp.h
similarity index 100%
rename from windows/vs2010/include/openssl/comp.h
rename to windows/include/openssl/comp.h
diff --git a/windows/vs2010/include/openssl/conf.h b/windows/include/openssl/conf.h
similarity index 100%
rename from windows/vs2010/include/openssl/conf.h
rename to windows/include/openssl/conf.h
diff --git a/windows/vs2010/include/openssl/conf_api.h b/windows/include/openssl/conf_api.h
similarity index 100%
rename from windows/vs2010/include/openssl/conf_api.h
rename to windows/include/openssl/conf_api.h
diff --git a/windows/vs2010/include/openssl/crypto.h b/windows/include/openssl/crypto.h
similarity index 100%
rename from windows/vs2010/include/openssl/crypto.h
rename to windows/include/openssl/crypto.h
diff --git a/windows/vs2010/include/openssl/des.h b/windows/include/openssl/des.h
similarity index 100%
rename from windows/vs2010/include/openssl/des.h
rename to windows/include/openssl/des.h
diff --git a/windows/vs2010/include/openssl/des_old.h b/windows/include/openssl/des_old.h
similarity index 100%
rename from windows/vs2010/include/openssl/des_old.h
rename to windows/include/openssl/des_old.h
diff --git a/windows/vs2010/include/openssl/dh.h b/windows/include/openssl/dh.h
similarity index 100%
rename from windows/vs2010/include/openssl/dh.h
rename to windows/include/openssl/dh.h
diff --git a/windows/vs2010/include/openssl/dsa.h b/windows/include/openssl/dsa.h
similarity index 100%
rename from windows/vs2010/include/openssl/dsa.h
rename to windows/include/openssl/dsa.h
diff --git a/windows/vs2010/include/openssl/dso.h b/windows/include/openssl/dso.h
similarity index 100%
rename from windows/vs2010/include/openssl/dso.h
rename to windows/include/openssl/dso.h
diff --git a/windows/vs2010/include/openssl/dtls1.h b/windows/include/openssl/dtls1.h
similarity index 100%
rename from windows/vs2010/include/openssl/dtls1.h
rename to windows/include/openssl/dtls1.h
diff --git a/windows/vs2010/include/openssl/e_os2.h b/windows/include/openssl/e_os2.h
similarity index 100%
rename from windows/vs2010/include/openssl/e_os2.h
rename to windows/include/openssl/e_os2.h
diff --git a/windows/vs2010/include/openssl/ebcdic.h b/windows/include/openssl/ebcdic.h
similarity index 100%
rename from windows/vs2010/include/openssl/ebcdic.h
rename to windows/include/openssl/ebcdic.h
diff --git a/windows/vs2010/include/openssl/ec.h b/windows/include/openssl/ec.h
similarity index 100%
rename from windows/vs2010/include/openssl/ec.h
rename to windows/include/openssl/ec.h
diff --git a/windows/vs2010/include/openssl/ecdh.h b/windows/include/openssl/ecdh.h
similarity index 100%
rename from windows/vs2010/include/openssl/ecdh.h
rename to windows/include/openssl/ecdh.h
diff --git a/windows/vs2010/include/openssl/ecdsa.h b/windows/include/openssl/ecdsa.h
similarity index 100%
rename from windows/vs2010/include/openssl/ecdsa.h
rename to windows/include/openssl/ecdsa.h
diff --git a/windows/vs2010/include/openssl/engine.h b/windows/include/openssl/engine.h
similarity index 100%
rename from windows/vs2010/include/openssl/engine.h
rename to windows/include/openssl/engine.h
diff --git a/windows/vs2010/include/openssl/err.h b/windows/include/openssl/err.h
similarity index 100%
rename from windows/vs2010/include/openssl/err.h
rename to windows/include/openssl/err.h
diff --git a/windows/vs2010/include/openssl/evp.h b/windows/include/openssl/evp.h
similarity index 100%
rename from windows/vs2010/include/openssl/evp.h
rename to windows/include/openssl/evp.h
diff --git a/windows/vs2010/include/openssl/hmac.h b/windows/include/openssl/hmac.h
similarity index 100%
rename from windows/vs2010/include/openssl/hmac.h
rename to windows/include/openssl/hmac.h
diff --git a/windows/vs2010/include/openssl/idea.h b/windows/include/openssl/idea.h
similarity index 100%
rename from windows/vs2010/include/openssl/idea.h
rename to windows/include/openssl/idea.h
diff --git a/windows/vs2010/include/openssl/krb5_asn.h b/windows/include/openssl/krb5_asn.h
similarity index 100%
rename from windows/vs2010/include/openssl/krb5_asn.h
rename to windows/include/openssl/krb5_asn.h
diff --git a/windows/vs2010/include/openssl/kssl.h b/windows/include/openssl/kssl.h
similarity index 100%
rename from windows/vs2010/include/openssl/kssl.h
rename to windows/include/openssl/kssl.h
diff --git a/windows/vs2010/include/openssl/lhash.h b/windows/include/openssl/lhash.h
similarity index 100%
rename from windows/vs2010/include/openssl/lhash.h
rename to windows/include/openssl/lhash.h
diff --git a/windows/vs2010/include/openssl/md4.h b/windows/include/openssl/md4.h
similarity index 100%
rename from windows/vs2010/include/openssl/md4.h
rename to windows/include/openssl/md4.h
diff --git a/windows/vs2010/include/openssl/md5.h b/windows/include/openssl/md5.h
similarity index 100%
rename from windows/vs2010/include/openssl/md5.h
rename to windows/include/openssl/md5.h
diff --git a/windows/vs2010/include/openssl/mdc2.h b/windows/include/openssl/mdc2.h
similarity index 100%
rename from windows/vs2010/include/openssl/mdc2.h
rename to windows/include/openssl/mdc2.h
diff --git a/windows/vs2010/include/openssl/modes.h b/windows/include/openssl/modes.h
similarity index 100%
rename from windows/vs2010/include/openssl/modes.h
rename to windows/include/openssl/modes.h
diff --git a/windows/vs2010/include/openssl/obj_mac.h b/windows/include/openssl/obj_mac.h
similarity index 100%
rename from windows/vs2010/include/openssl/obj_mac.h
rename to windows/include/openssl/obj_mac.h
diff --git a/windows/vs2010/include/openssl/objects.h b/windows/include/openssl/objects.h
similarity index 100%
rename from windows/vs2010/include/openssl/objects.h
rename to windows/include/openssl/objects.h
diff --git a/windows/vs2010/include/openssl/ocsp.h b/windows/include/openssl/ocsp.h
similarity index 100%
rename from windows/vs2010/include/openssl/ocsp.h
rename to windows/include/openssl/ocsp.h
diff --git a/windows/vs2010/include/openssl/opensslconf.h b/windows/include/openssl/opensslconf.h
similarity index 100%
rename from windows/vs2010/include/openssl/opensslconf.h
rename to windows/include/openssl/opensslconf.h
diff --git a/windows/vs2010/include/openssl/opensslv.h b/windows/include/openssl/opensslv.h
similarity index 100%
rename from windows/vs2010/include/openssl/opensslv.h
rename to windows/include/openssl/opensslv.h
diff --git a/windows/vs2010/include/openssl/ossl_typ.h b/windows/include/openssl/ossl_typ.h
similarity index 100%
rename from windows/vs2010/include/openssl/ossl_typ.h
rename to windows/include/openssl/ossl_typ.h
diff --git a/windows/vs2010/include/openssl/pem.h b/windows/include/openssl/pem.h
similarity index 100%
rename from windows/vs2010/include/openssl/pem.h
rename to windows/include/openssl/pem.h
diff --git a/windows/vs2010/include/openssl/pem2.h b/windows/include/openssl/pem2.h
similarity index 100%
rename from windows/vs2010/include/openssl/pem2.h
rename to windows/include/openssl/pem2.h
diff --git a/windows/vs2010/include/openssl/pkcs12.h b/windows/include/openssl/pkcs12.h
similarity index 100%
rename from windows/vs2010/include/openssl/pkcs12.h
rename to windows/include/openssl/pkcs12.h
diff --git a/windows/vs2010/include/openssl/pkcs7.h b/windows/include/openssl/pkcs7.h
similarity index 100%
rename from windows/vs2010/include/openssl/pkcs7.h
rename to windows/include/openssl/pkcs7.h
diff --git a/windows/vs2010/include/openssl/pqueue.h b/windows/include/openssl/pqueue.h
similarity index 100%
rename from windows/vs2010/include/openssl/pqueue.h
rename to windows/include/openssl/pqueue.h
diff --git a/windows/vs2010/include/openssl/rand.h b/windows/include/openssl/rand.h
similarity index 100%
rename from windows/vs2010/include/openssl/rand.h
rename to windows/include/openssl/rand.h
diff --git a/windows/vs2010/include/openssl/rc2.h b/windows/include/openssl/rc2.h
similarity index 100%
rename from windows/vs2010/include/openssl/rc2.h
rename to windows/include/openssl/rc2.h
diff --git a/windows/vs2010/include/openssl/rc4.h b/windows/include/openssl/rc4.h
similarity index 100%
rename from windows/vs2010/include/openssl/rc4.h
rename to windows/include/openssl/rc4.h
diff --git a/windows/vs2010/include/openssl/ripemd.h b/windows/include/openssl/ripemd.h
similarity index 100%
rename from windows/vs2010/include/openssl/ripemd.h
rename to windows/include/openssl/ripemd.h
diff --git a/windows/vs2010/include/openssl/rsa.h b/windows/include/openssl/rsa.h
similarity index 100%
rename from windows/vs2010/include/openssl/rsa.h
rename to windows/include/openssl/rsa.h
diff --git a/windows/vs2010/include/openssl/safestack.h b/windows/include/openssl/safestack.h
similarity index 100%
rename from windows/vs2010/include/openssl/safestack.h
rename to windows/include/openssl/safestack.h
diff --git a/windows/vs2010/include/openssl/seed.h b/windows/include/openssl/seed.h
similarity index 100%
rename from windows/vs2010/include/openssl/seed.h
rename to windows/include/openssl/seed.h
diff --git a/windows/vs2010/include/openssl/sha.h b/windows/include/openssl/sha.h
similarity index 100%
rename from windows/vs2010/include/openssl/sha.h
rename to windows/include/openssl/sha.h
diff --git a/windows/vs2010/include/openssl/srp.h b/windows/include/openssl/srp.h
similarity index 100%
rename from windows/vs2010/include/openssl/srp.h
rename to windows/include/openssl/srp.h
diff --git a/windows/vs2010/include/openssl/srtp.h b/windows/include/openssl/srtp.h
similarity index 100%
rename from windows/vs2010/include/openssl/srtp.h
rename to windows/include/openssl/srtp.h
diff --git a/windows/vs2010/include/openssl/ssl.h b/windows/include/openssl/ssl.h
similarity index 100%
rename from windows/vs2010/include/openssl/ssl.h
rename to windows/include/openssl/ssl.h
diff --git a/windows/vs2010/include/openssl/ssl2.h b/windows/include/openssl/ssl2.h
similarity index 100%
rename from windows/vs2010/include/openssl/ssl2.h
rename to windows/include/openssl/ssl2.h
diff --git a/windows/vs2010/include/openssl/ssl23.h b/windows/include/openssl/ssl23.h
similarity index 100%
rename from windows/vs2010/include/openssl/ssl23.h
rename to windows/include/openssl/ssl23.h
diff --git a/windows/vs2010/include/openssl/ssl3.h b/windows/include/openssl/ssl3.h
similarity index 100%
rename from windows/vs2010/include/openssl/ssl3.h
rename to windows/include/openssl/ssl3.h
diff --git a/windows/vs2010/include/openssl/stack.h b/windows/include/openssl/stack.h
similarity index 100%
rename from windows/vs2010/include/openssl/stack.h
rename to windows/include/openssl/stack.h
diff --git a/windows/vs2010/include/openssl/symhacks.h b/windows/include/openssl/symhacks.h
similarity index 100%
rename from windows/vs2010/include/openssl/symhacks.h
rename to windows/include/openssl/symhacks.h
diff --git a/windows/vs2010/include/openssl/tls1.h b/windows/include/openssl/tls1.h
similarity index 100%
rename from windows/vs2010/include/openssl/tls1.h
rename to windows/include/openssl/tls1.h
diff --git a/windows/vs2010/include/openssl/ts.h b/windows/include/openssl/ts.h
similarity index 100%
rename from windows/vs2010/include/openssl/ts.h
rename to windows/include/openssl/ts.h
diff --git a/windows/vs2010/include/openssl/txt_db.h b/windows/include/openssl/txt_db.h
similarity index 100%
rename from windows/vs2010/include/openssl/txt_db.h
rename to windows/include/openssl/txt_db.h
diff --git a/windows/vs2010/include/openssl/ui.h b/windows/include/openssl/ui.h
similarity index 100%
rename from windows/vs2010/include/openssl/ui.h
rename to windows/include/openssl/ui.h
diff --git a/windows/vs2010/include/openssl/ui_compat.h b/windows/include/openssl/ui_compat.h
similarity index 100%
rename from windows/vs2010/include/openssl/ui_compat.h
rename to windows/include/openssl/ui_compat.h
diff --git a/windows/vs2010/include/openssl/whrlpool.h b/windows/include/openssl/whrlpool.h
similarity index 100%
rename from windows/vs2010/include/openssl/whrlpool.h
rename to windows/include/openssl/whrlpool.h
diff --git a/windows/vs2010/include/openssl/x509.h b/windows/include/openssl/x509.h
similarity index 100%
rename from windows/vs2010/include/openssl/x509.h
rename to windows/include/openssl/x509.h
diff --git a/windows/vs2010/include/openssl/x509_vfy.h b/windows/include/openssl/x509_vfy.h
similarity index 100%
rename from windows/vs2010/include/openssl/x509_vfy.h
rename to windows/include/openssl/x509_vfy.h
diff --git a/windows/vs2010/include/openssl/x509v3.h b/windows/include/openssl/x509v3.h
similarity index 100%
rename from windows/vs2010/include/openssl/x509v3.h
rename to windows/include/openssl/x509v3.h
diff --git a/windows/vs2010/lib/jansson32.lib b/windows/lib/jansson32.lib
similarity index 100%
rename from windows/vs2010/lib/jansson32.lib
rename to windows/lib/jansson32.lib
diff --git a/windows/vs2010/lib/jansson64.lib b/windows/lib/jansson64.lib
similarity index 100%
rename from windows/vs2010/lib/jansson64.lib
rename to windows/lib/jansson64.lib
diff --git a/windows/vs2010/lib/libeay32.lib b/windows/lib/libeay32.lib
similarity index 100%
rename from windows/vs2010/lib/libeay32.lib
rename to windows/lib/libeay32.lib
diff --git a/windows/vs2010/lib/libeay64.lib b/windows/lib/libeay64.lib
similarity index 100%
rename from windows/vs2010/lib/libeay64.lib
rename to windows/lib/libeay64.lib
diff --git a/windows/vs2010/include/getopt.h b/windows/vs2010/include/getopt.h
deleted file mode 100644
index 6f018fee..00000000
--- a/windows/vs2010/include/getopt.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-extern int opterr;
-extern int optind;
-extern int optopt;
-extern char * optarg;
-
-int getopt( int nargc, char * const *nargv, const char *ostr);
\ No newline at end of file
diff --git a/windows/vs2010/include/regex.h b/windows/vs2010/include/regex.h
deleted file mode 100644
index 690d99d4..00000000
--- a/windows/vs2010/include/regex.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _REGEX_H
-#define _REGEX_H 1
-
-# include <pcre.h>
-# include <pcreposix.h>
-
-#endif /* _REGEX_H */
diff --git a/windows/vs2010/libyara/libyara.vcxproj b/windows/vs2010/libyara/libyara.vcxproj
index ac065042..10d1688b 100644
--- a/windows/vs2010/libyara/libyara.vcxproj
+++ b/windows/vs2010/libyara/libyara.vcxproj
@@ -56,25 +56,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetName>$(ProjectName)32</TargetName>
     <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>$(ProjectName)64</TargetName>
     <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>$(ProjectName)32</TargetName>
     <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>$(ProjectName)64</TargetName>
     <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableSpecificWarnings>4005;4273;4090;</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -83,7 +84,7 @@
     <Lib>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <AdditionalDependencies>advapi32.lib;jansson32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
     </Lib>
     <ProjectReference>
@@ -98,7 +99,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4005;4273;4090;</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName>
@@ -106,7 +107,7 @@
     <Lib>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <AdditionalDependencies>advapi32.lib;jansson64.lib;libeay64.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -120,7 +121,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -128,7 +129,7 @@
     </ClCompile>
     <Lib>
       <AdditionalDependencies>advapi32.lib;jansson32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
     </Lib>
     <Link>
@@ -140,14 +141,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>advapi32.lib;jansson64.lib;libeay64.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
       <SuppressStartupBanner>false</SuppressStartupBanner>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
     </Lib>
diff --git a/windows/vs2010/yara.sln b/windows/vs2010/yara.sln
index 054f60c1..53a4058e 100644
--- a/windows/vs2010/yara.sln
+++ b/windows/vs2010/yara.sln
@@ -1,16 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "libyara\libyara.vcxproj", "{5E18111F-0F7D-08E0-195A-C60C1C0DD239}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "libyara\libyara.vcxproj", "{B90417B6-5132-DA5C-DBA8-E8A830BE8172}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", "yara\yara.vcxproj", "{E203D7BB-29B9-4152-9208-BB410983CE8C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239} = {5E18111F-0F7D-08E0-195A-C60C1C0DD239}
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172} = {B90417B6-5132-DA5C-DBA8-E8A830BE8172}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yarac", "yarac\yarac.vcxproj", "{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239} = {5E18111F-0F7D-08E0-195A-C60C1C0DD239}
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172} = {B90417B6-5132-DA5C-DBA8-E8A830BE8172}
 	EndProjectSection
 EndProject
 Global
@@ -21,14 +21,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Debug|Win32.Build.0 = Debug|Win32
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Debug|x64.ActiveCfg = Debug|x64
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Debug|x64.Build.0 = Debug|x64
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Release|Win32.ActiveCfg = Release|Win32
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Release|Win32.Build.0 = Release|Win32
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Release|x64.ActiveCfg = Release|x64
-		{5E18111F-0F7D-08E0-195A-C60C1C0DD239}.Release|x64.Build.0 = Release|x64
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Debug|Win32.Build.0 = Debug|Win32
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Debug|x64.ActiveCfg = Debug|x64
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Debug|x64.Build.0 = Debug|x64
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Release|Win32.ActiveCfg = Release|Win32
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Release|Win32.Build.0 = Release|Win32
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Release|x64.ActiveCfg = Release|x64
+		{B90417B6-5132-DA5C-DBA8-E8A830BE8172}.Release|x64.Build.0 = Release|x64
 		{E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|Win32.Build.0 = Debug|Win32
 		{E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/windows/vs2010/yara/yara.vcxproj b/windows/vs2010/yara/yara.vcxproj
index 423819de..b889b848 100644
--- a/windows/vs2010/yara/yara.vcxproj
+++ b/windows/vs2010/yara/yara.vcxproj
@@ -94,7 +94,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..\argparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -113,7 +113,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -132,7 +132,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -157,7 +157,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
diff --git a/windows/vs2010/yarac/yarac.vcxproj b/windows/vs2010/yarac/yarac.vcxproj
index 94303f11..dfb2f925 100644
--- a/windows/vs2010/yarac/yarac.vcxproj
+++ b/windows/vs2010/yarac/yarac.vcxproj
@@ -73,7 +73,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -92,7 +92,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -117,7 +117,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\..\..\windows\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>