diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp
index 8fbfdb8001..852916f34b 100644
--- a/modules/ripple_ledger/ripple_ledger.cpp
+++ b/modules/ripple_ledger/ripple_ledger.cpp
@@ -90,6 +90,7 @@
 #include "src/cpp/ripple/LedgerTiming.h"
 #include "src/cpp/ripple/Log.h"
 #include "src/cpp/ripple/NetworkOPs.h"
+#include "src/cpp/ripple/NicknameState.h"
 #include "src/cpp/ripple/Offer.h"
 #include "src/cpp/ripple/OfferCancelTransactor.h"
 #include "src/cpp/ripple/OfferCreateTransactor.h"
@@ -152,6 +153,7 @@
 #include "src/cpp/ripple/LedgerMaster.cpp"
 #include "src/cpp/ripple/LedgerProposal.cpp" // no log
 #include "src/cpp/ripple/LedgerTiming.cpp"
+#include "src/cpp/ripple/NicknameState.cpp" // no log
 #include "src/cpp/ripple/Offer.cpp" // no log
 #include "src/cpp/ripple/OrderBook.cpp" // no log
 #include "src/cpp/ripple/OrderBookDB.cpp"
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index d823e813f7..9e34f5c315 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -756,7 +756,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\NicknameState.cpp" />
+    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\cpp\ripple\Offer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 04d119b12a..af05e7501a 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -400,9 +400,6 @@
     <ClCompile Include="src\cpp\protobuf\src\google\protobuf\stubs\substitute.cc">
       <Filter>0. Third Party Code\protobuf\stubs</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
-      <Filter>Unsorted Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
       <Filter>Unsorted Sources</Filter>
     </ClCompile>
@@ -727,6 +724,9 @@
     <ClCompile Include="src\cpp\ripple\Wallet.cpp">
       <Filter>1. Modules\ripple_ledger\transactions</Filter>
     </ClCompile>
+    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
+      <Filter>1. Modules\ripple_ledger\processing</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">
@@ -1032,9 +1032,6 @@
     <ClInclude Include="src\cpp\ripple\NetworkStatus.h">
       <Filter>Unsorted Sources</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\NicknameState.h">
-      <Filter>Unsorted Sources</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\Pathfinder.h">
       <Filter>Unsorted Sources</Filter>
     </ClInclude>
@@ -1365,6 +1362,9 @@
     <ClInclude Include="src\cpp\ripple\Wallet.h">
       <Filter>1. Modules\ripple_ledger\transactions</Filter>
     </ClInclude>
+    <ClInclude Include="src\cpp\ripple\NicknameState.h">
+      <Filter>1. Modules\ripple_ledger\processing</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="wallet.xml" />
diff --git a/src/cpp/ripple/NicknameState.cpp b/src/cpp/ripple/NicknameState.cpp
index 83d7c1bc1a..e0b6d6e472 100644
--- a/src/cpp/ripple/NicknameState.cpp
+++ b/src/cpp/ripple/NicknameState.cpp
@@ -1,4 +1,3 @@
-#include "NicknameState.h"
 
 NicknameState::NicknameState(SerializedLedgerEntry::pointer ledgerEntry) :
     mLedgerEntry(ledgerEntry)
diff --git a/src/cpp/ripple/NicknameState.h b/src/cpp/ripple/NicknameState.h
index adc0eeb454..ec0b4738e8 100644
--- a/src/cpp/ripple/NicknameState.h
+++ b/src/cpp/ripple/NicknameState.h
@@ -1,15 +1,11 @@
-#ifndef _NICKNAMESTATE_
-#define _NICKNAMESTATE_
+#ifndef NICKNAMESTATE_H
+#define NICKNAMESTATE_H
 
 //
 // State of a nickname node.
 // - Isolate ledger entry format.
 //
 
-#include "SerializedLedger.h"
-
-#include <boost/shared_ptr.hpp>
-
 class NicknameState
 {
 public: