diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index bc1266bcb..ac62ebd55 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -103,24 +103,24 @@
     <Filter Include="1. Modules\ripple_net\overlay">
       <UniqueIdentifier>{1b44bca2-5d6b-45b6-815b-797059fb2c8e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_basics\mess">
-      <UniqueIdentifier>{3cd9631b-129b-4d0e-af70-d879e6f31a88}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_basics\mess\types">
-      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_basics\mess\protobuf">
-      <UniqueIdentifier>{eb0c6bda-cf68-4334-a8c3-8d39202852a0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_basics\mess\diagnostic">
-      <UniqueIdentifier>{505d1e20-ff6a-446b-8ce0-962e11b78820}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_basics\mess\containers">
-      <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_basics\types">
       <UniqueIdentifier>{71aefc54-1459-47a5-af76-995f121d498a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_basics\%28mess%29">
+      <UniqueIdentifier>{3cd9631b-129b-4d0e-af70-d879e6f31a88}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_basics\%28mess%29\types">
+      <UniqueIdentifier>{1b463564-35d9-43d1-b3a0-21b344a3a1c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_basics\%28mess%29\protobuf">
+      <UniqueIdentifier>{eb0c6bda-cf68-4334-a8c3-8d39202852a0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_basics\%28mess%29\diagnostic">
+      <UniqueIdentifier>{505d1e20-ff6a-446b-8ce0-962e11b78820}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_basics\%28mess%29\containers">
+      <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -481,52 +481,52 @@
       <Filter>1. Modules\ripple_ledger\serialization</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Amount.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\BitcoinUtil.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\DeterministicKeys.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ECIES.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\FieldNames.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\HashedObject.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PackedMessage.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParameterTable.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ParseSection.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\PlatRand.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\ProofOfWork.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\rfc1751.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\utils.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
       <Filter>1. Modules\ripple_basics</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\Log.cpp">
-      <Filter>1. Modules\ripple_basics\mess\diagnostic</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\diagnostic</Filter>
     </ClCompile>
     <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
       <Filter>1. Modules\ripple_ledger</Filter>
@@ -694,7 +694,7 @@
       <Filter>1. Modules\ripple_net\overlay</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
       <Filter>1. Modules\ripple_ledger\transactions</Filter>
@@ -706,19 +706,19 @@
       <Filter>1. Modules\ripple_ledger\processing</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\RangeSet.cpp">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
       <Filter>1. Modules\ripple_main\core</Filter>
@@ -730,7 +730,7 @@
       <Filter>1. Modules\ripple_ledger\processing</Filter>
     </ClCompile>
     <ClCompile Include="build\proto\ripple.pb.cc">
-      <Filter>1. Modules\ripple_basics\mess\protobuf</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\protobuf</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1098,52 +1098,52 @@
       <Filter>1. Modules\ripple_ledger\serialization</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\base58.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\bignum.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\BigNum64.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\BitcoinUtil.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\FieldNames.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HashedObject.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\HashPrefixes.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\key.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\PackedMessage.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParameterTable.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ParseSection.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ProofOfWork.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\rfc1751.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\utils.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_basics\ripple_basics.h">
       <Filter>1. Modules\ripple_basics</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Log.h">
-      <Filter>1. Modules\ripple_basics\mess\diagnostic</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\diagnostic</Filter>
     </ClInclude>
     <ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
       <Filter>1. Modules\ripple_ledger</Filter>
@@ -1308,7 +1308,7 @@
       <Filter>1. Modules\ripple_net\service</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\uint256.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
       <Filter>1. Modules\ripple_net\overlay</Filter>
@@ -1317,7 +1317,7 @@
       <Filter>1. Modules\ripple_net\overlay</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RippleAddress.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
       <Filter>1. Modules\ripple_ledger\transactions</Filter>
@@ -1329,25 +1329,25 @@
       <Filter>1. Modules\ripple_ledger\processing</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\RangeSet.h">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\KeyCache.h">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SHAMap.h">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SHAMapSync.h">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\TaggedCache.h">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\ScopedLock.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SecureAllocator.h">
-      <Filter>1. Modules\ripple_basics\mess\containers</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\containers</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\Version.h">
       <Filter>1. Modules\ripple_main\core</Filter>
@@ -1362,13 +1362,13 @@
       <Filter>1. Modules\ripple_main\core</Filter>
     </ClInclude>
     <ClInclude Include="build\proto\ripple.pb.h">
-      <Filter>1. Modules\ripple_basics\mess\protobuf</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\protobuf</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\IntegerTypes.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\ripple\SerializeProto.h">
-      <Filter>1. Modules\ripple_basics\mess\types</Filter>
+      <Filter>1. Modules\ripple_basics\%28mess%29\types</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/cpp/ripple/SecureAllocator.h b/src/cpp/ripple/SecureAllocator.h
index 85c3b6db2..daedaf987 100644
--- a/src/cpp/ripple/SecureAllocator.h
+++ b/src/cpp/ripple/SecureAllocator.h
@@ -1,3 +1,7 @@
+
+#ifndef RIPPLE_SECUREALLOCATOR_H
+#define RIPPLE_SECUREALLOCATOR_H
+
 //
 // Allocator that locks its contents from being paged
 // out of memory and clears its contents before deletion.
@@ -41,3 +45,5 @@ struct secure_allocator : public std::allocator<T>
 		std::allocator<T>::deallocate(p, n);
 	}
 };
+
+#endif