@@ -24,7 +24,7 @@ void Sha256_Init(CSha256 *p);

 void Sha256_Update(CSha256 *p, const Byte *data, size_t size);

 void Sha256_Final(CSha256 *p, Byte *digest);

 #else

-#include "sha256.h"

+#include "../sha256.h"

 #define CSha256 SHA256_CTX

 #define Sha256_Init sha256_init

 #define Sha256_Update sha256_update

@@ -22,6 +22,7 @@

 #include "clamav-config.h"

 #endif

+#include "7z/Sha256.h"

 #include "7z/LzmaDec.h"

 #include "7z/XzCrc64.h"

 #include "xz_iface.h"

@@ -169,7 +169,6 @@

     <ClCompile Include="..\libclamav\7z\BraIA64.c" />

     <ClCompile Include="..\libclamav\7z\CpuArch.c" />

     <ClCompile Include="..\libclamav\7z\Delta.c" />

-    <ClCompile Include="..\libclamav\7z\Sha256.c" />

     <ClCompile Include="..\libclamav\7z\Xz.c" />

     <ClCompile Include="..\libclamav\7z\XzCrc64.c" />

     <ClCompile Include="..\libclamav\7z\XzDec.c" />

@@ -858,9 +858,6 @@

     <ClCompile Include="..\libclamav\7z\Delta.c">

       <Filter>Source Files\7z</Filter>

     </ClCompile>

-    <ClCompile Include="..\libclamav\7z\Sha256.c">

-      <Filter>Source Files\7z</Filter>

-    </ClCompile>

     <ClCompile Include="..\libclamav\7z\Xz.c">

       <Filter>Source Files\7z</Filter>

     </ClCompile>