diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj
index 956252979..9faae62c3 100644
--- a/windows/LibEthereum.vcxproj
+++ b/windows/LibEthereum.vcxproj
@@ -103,8 +103,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\libethcore\_libethcore.cpp" />
+    <ClCompile Include="..\libethereum\Account.cpp" />
     <ClCompile Include="..\libethereum\AccountDiff.cpp" />
-    <ClCompile Include="..\libethereum\AddressState.cpp" />
     <ClCompile Include="..\libethereum\BlockChain.cpp" />
     <ClCompile Include="..\libethereum\BlockDetails.cpp" />
     <ClCompile Include="..\libethereum\BlockQueue.cpp" />
@@ -319,8 +319,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="..\libethereum\Account.h" />
     <ClInclude Include="..\libethereum\AccountDiff.h" />
-    <ClInclude Include="..\libethereum\AddressState.h" />
     <ClInclude Include="..\libethereum\All.h" />
     <ClInclude Include="..\libethereum\BlockChain.h" />
     <ClInclude Include="..\libethereum\BlockDetails.h" />
diff --git a/windows/LibEthereum.vcxproj.filters b/windows/LibEthereum.vcxproj.filters
index d96ee47a5..5e1497b86 100644
--- a/windows/LibEthereum.vcxproj.filters
+++ b/windows/LibEthereum.vcxproj.filters
@@ -4,9 +4,6 @@
     <ClCompile Include="stdafx.cpp">
       <Filter>Windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\libethereum\AddressState.cpp">
-      <Filter>libethereum</Filter>
-    </ClCompile>
     <ClCompile Include="..\libethereum\BlockChain.cpp">
       <Filter>libethereum</Filter>
     </ClCompile>
@@ -205,14 +202,14 @@
     <ClCompile Include="..\libdevcrypto\SHA3MAC.cpp">
       <Filter>libdevcrypto</Filter>
     </ClCompile>
+    <ClCompile Include="..\libethereum\Account.cpp">
+      <Filter>libethereum</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
       <Filter>Windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\libethereum\AddressState.h">
-      <Filter>libethereum</Filter>
-    </ClInclude>
     <ClInclude Include="..\libethereum\BlockChain.h">
       <Filter>libethereum</Filter>
     </ClInclude>
@@ -441,6 +438,9 @@
     <ClInclude Include="..\libdevcrypto\SHA3MAC.h">
       <Filter>libdevcrypto</Filter>
     </ClInclude>
+    <ClInclude Include="..\libethereum\Account.h">
+      <Filter>libethereum</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Windows">