diff --git a/proj/vc7ide/alloc_basic_test.vcproj b/proj/vc7ide/alloc_basic_test.vcproj
index edc68bc..cb13a88 100644
--- a/proj/vc7ide/alloc_basic_test.vcproj
+++ b/proj/vc7ide/alloc_basic_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/alloc_basic_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/alloc_full_test.vcproj b/proj/vc7ide/alloc_full_test.vcproj
index c890948..2508d0e 100644
--- a/proj/vc7ide/alloc_full_test.vcproj
+++ b/proj/vc7ide/alloc_full_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/alloc_full_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/allocator_traits_test.vcproj b/proj/vc7ide/allocator_traits_test.vcproj
index b17763f..1091006 100644
--- a/proj/vc7ide/allocator_traits_test.vcproj
+++ b/proj/vc7ide/allocator_traits_test.vcproj
@@ -94,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_adaptive_node_pool.vcproj b/proj/vc7ide/bench_adaptive_node_pool.vcproj
index c1ea28d..8749c28 100644
--- a/proj/vc7ide/bench_adaptive_node_pool.vcproj
+++ b/proj/vc7ide/bench_adaptive_node_pool.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_adaptive_node_pool.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_alloc.vcproj b/proj/vc7ide/bench_alloc.vcproj
index 2ae0a72..90404bc 100644
--- a/proj/vc7ide/bench_alloc.vcproj
+++ b/proj/vc7ide/bench_alloc.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_alloc.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_alloc_expand_bwd.vcproj b/proj/vc7ide/bench_alloc_expand_bwd.vcproj
index 608d69d..306eeea 100644
--- a/proj/vc7ide/bench_alloc_expand_bwd.vcproj
+++ b/proj/vc7ide/bench_alloc_expand_bwd.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_alloc_expand_bwd.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_alloc_expand_fwd.vcproj b/proj/vc7ide/bench_alloc_expand_fwd.vcproj
index b1d0242..e3f1415 100644
--- a/proj/vc7ide/bench_alloc_expand_fwd.vcproj
+++ b/proj/vc7ide/bench_alloc_expand_fwd.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_alloc_expand_fwd.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_alloc_shrink_to_fit.vcproj b/proj/vc7ide/bench_alloc_shrink_to_fit.vcproj
index 57f476e..cd1fa17 100644
--- a/proj/vc7ide/bench_alloc_shrink_to_fit.vcproj
+++ b/proj/vc7ide/bench_alloc_shrink_to_fit.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_alloc_shrink_to_fit.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_alloc_stable_vector_burst_allocation.vcproj b/proj/vc7ide/bench_alloc_stable_vector_burst_allocation.vcproj
index 9300f98..e202b9b 100644
--- a/proj/vc7ide/bench_alloc_stable_vector_burst_allocation.vcproj
+++ b/proj/vc7ide/bench_alloc_stable_vector_burst_allocation.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_alloc_stable_vector_burst_allocation.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_flat_multiset.vcproj b/proj/vc7ide/bench_flat_multiset.vcproj
index 2b3b789..1c1bb90 100644
--- a/proj/vc7ide/bench_flat_multiset.vcproj
+++ b/proj/vc7ide/bench_flat_multiset.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_flat_multiset.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_flat_set.vcproj b/proj/vc7ide/bench_flat_set.vcproj
index 6c19dce..54d2cd4 100644
--- a/proj/vc7ide/bench_flat_set.vcproj
+++ b/proj/vc7ide/bench_flat_set.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_flat_set.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_set.vcproj b/proj/vc7ide/bench_set.vcproj
index 432a98e..8a69627 100644
--- a/proj/vc7ide/bench_set.vcproj
+++ b/proj/vc7ide/bench_set.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_set.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_set_alloc_v2.vcproj b/proj/vc7ide/bench_set_alloc_v2.vcproj
index f8c5a20..160c27e 100644
--- a/proj/vc7ide/bench_set_alloc_v2.vcproj
+++ b/proj/vc7ide/bench_set_alloc_v2.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_set_alloc_v2.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_set_avl.vcproj b/proj/vc7ide/bench_set_avl.vcproj
index 0c32b63..e18fa66 100644
--- a/proj/vc7ide/bench_set_avl.vcproj
+++ b/proj/vc7ide/bench_set_avl.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_set_avl.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_set_multi.vcproj b/proj/vc7ide/bench_set_multi.vcproj
index 3f5bb70..166df34 100644
--- a/proj/vc7ide/bench_set_multi.vcproj
+++ b/proj/vc7ide/bench_set_multi.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_set_multi.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_set_sg.vcproj b/proj/vc7ide/bench_set_sg.vcproj
index 1b034f3..751e653 100644
--- a/proj/vc7ide/bench_set_sg.vcproj
+++ b/proj/vc7ide/bench_set_sg.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_set_sg.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_set_sp.vcproj b/proj/vc7ide/bench_set_sp.vcproj
index 8e9c199..5a123ab 100644
--- a/proj/vc7ide/bench_set_sp.vcproj
+++ b/proj/vc7ide/bench_set_sp.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_set_sp.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/bench_static_vector.vcproj b/proj/vc7ide/bench_static_vector.vcproj
index 549308f..5648015 100644
--- a/proj/vc7ide/bench_static_vector.vcproj
+++ b/proj/vc7ide/bench_static_vector.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/bench_static_vector.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/deque_test.vcproj b/proj/vc7ide/deque_test.vcproj
index 0b5d2f6..c2344fe 100644
--- a/proj/vc7ide/deque_test.vcproj
+++ b/proj/vc7ide/deque_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/deque_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/doc_custom_tree.vcproj b/proj/vc7ide/doc_custom_tree.vcproj
index a7cc926..f0f0363 100644
--- a/proj/vc7ide/doc_custom_tree.vcproj
+++ b/proj/vc7ide/doc_custom_tree.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/doc_custom_tree.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/doc_emplace.vcproj b/proj/vc7ide/doc_emplace.vcproj
index 78c050f..8140b54 100644
--- a/proj/vc7ide/doc_emplace.vcproj
+++ b/proj/vc7ide/doc_emplace.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/doc_emplace.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/doc_extended_allocators.vcproj b/proj/vc7ide/doc_extended_allocators.vcproj
index 7663a48..945ace3 100644
--- a/proj/vc7ide/doc_extended_allocators.vcproj
+++ b/proj/vc7ide/doc_extended_allocators.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/doc_extended_allocators.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/doc_move_containers.vcproj b/proj/vc7ide/doc_move_containers.vcproj
index 030654f..6417ab1 100644
--- a/proj/vc7ide/doc_move_containers.vcproj
+++ b/proj/vc7ide/doc_move_containers.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/doc_move_containers.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/doc_recursive_containers.vcproj b/proj/vc7ide/doc_recursive_containers.vcproj
index 9110f66..363f796 100644
--- a/proj/vc7ide/doc_recursive_containers.vcproj
+++ b/proj/vc7ide/doc_recursive_containers.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/doc_recursive_containers.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/doc_type_erasure.vcproj b/proj/vc7ide/doc_type_erasure.vcproj
index a5cf08f..fd10787 100644
--- a/proj/vc7ide/doc_type_erasure.vcproj
+++ b/proj/vc7ide/doc_type_erasure.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/doc_type_erasure.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/flat_map_test.vcproj b/proj/vc7ide/flat_map_test.vcproj
index 778f8df..d7f13f2 100644
--- a/proj/vc7ide/flat_map_test.vcproj
+++ b/proj/vc7ide/flat_map_test.vcproj
@@ -44,7 +44,8 @@
             ProgramDatabaseFile="$(OutDir)/flat_map_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -95,7 +96,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/flat_set_test.vcproj b/proj/vc7ide/flat_set_test.vcproj
index 5ffc7a5..539399f 100644
--- a/proj/vc7ide/flat_set_test.vcproj
+++ b/proj/vc7ide/flat_set_test.vcproj
@@ -44,7 +44,8 @@
             ProgramDatabaseFile="$(OutDir)/flat_set_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -95,7 +96,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/hash_table_test.vcproj b/proj/vc7ide/hash_table_test.vcproj
index 96db7eb..fe90977 100644
--- a/proj/vc7ide/hash_table_test.vcproj
+++ b/proj/vc7ide/hash_table_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/hash_table_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/insert_vs_emplace_test.vcproj b/proj/vc7ide/insert_vs_emplace_test.vcproj
index 95db65c..320c3b0 100644
--- a/proj/vc7ide/insert_vs_emplace_test.vcproj
+++ b/proj/vc7ide/insert_vs_emplace_test.vcproj
@@ -1,134 +1,135 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-   ProjectType="Visual C++"
-   Version="7.10"
-   Name="insert_vs_emplace_test"
-   ProjectGUID="{51EC9223-B8A9-4F6E-EA24-352DFA76C72A}"
-   Keyword="Win32Proj">
-   <Platforms>
-      <Platform
-         Name="Win32"/>
-   </Platforms>
-   <Configurations>
-      <Configuration
-         Name="Debug|Win32"
-         OutputDirectory="../../Bin/Win32/Debug"
-         IntermediateDirectory="Debug/insert_vs_emplace_test"
-         ConfigurationType="1"
-         CharacterSet="2">
-         <Tool
-            Name="VCCLCompilerTool"
-            Optimization="0"
-            AdditionalIncludeDirectories="../../../.."
-            PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-            MinimalRebuild="TRUE"
-            ExceptionHandling="TRUE"
-            BasicRuntimeChecks="3"
-            RuntimeLibrary="3"
-            TreatWChar_tAsBuiltInType="TRUE"
-            ForceConformanceInForLoopScope="FALSE"
-            UsePrecompiledHeader="0"
-            WarningLevel="4"
-            Detect64BitPortabilityProblems="TRUE"
-            DebugInformationFormat="3"/>
-         <Tool
-            Name="VCCustomBuildTool"/>
-         <Tool
-            Name="VCLinkerTool"
-            AdditionalDependencies="winmm.lib"
-            OutputFile="$(OutDir)/insert_vs_emplace_test_d.exe"
-            LinkIncremental="1"
-            AdditionalLibraryDirectories="../../../../stage/lib"
-            GenerateDebugInformation="TRUE"
-            ProgramDatabaseFile="$(OutDir)/insert_vs_emplace_test.pdb"
-            SubSystem="1"
-            TargetMachine="1"
-            FixedBaseAddress="1"/>
-         <Tool
-            Name="VCMIDLTool"/>
-         <Tool
-            Name="VCPostBuildEventTool"/>
-         <Tool
-            Name="VCPreBuildEventTool"/>
-         <Tool
-            Name="VCPreLinkEventTool"/>
-         <Tool
-            Name="VCResourceCompilerTool"/>
-         <Tool
-            Name="VCWebServiceProxyGeneratorTool"/>
-         <Tool
-            Name="VCXMLDataGeneratorTool"/>
-         <Tool
-            Name="VCWebDeploymentTool"/>
-         <Tool
-            Name="VCManagedWrapperGeneratorTool"/>
-         <Tool
-            Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-      </Configuration>
-      <Configuration
-         Name="Release|Win32"
-         OutputDirectory="../../Bin/Win32/Release"
-         IntermediateDirectory="Release/insert_vs_emplace_test"
-         ConfigurationType="1"
-         CharacterSet="2">
-         <Tool
-            Name="VCCLCompilerTool"
-            AdditionalIncludeDirectories="../../../.."
-            PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-            RuntimeLibrary="2"
-            TreatWChar_tAsBuiltInType="TRUE"
-            ForceConformanceInForLoopScope="FALSE"
-            UsePrecompiledHeader="0"
-            WarningLevel="4"
-            Detect64BitPortabilityProblems="TRUE"
-            DebugInformationFormat="0"/>
-         <Tool
-            Name="VCCustomBuildTool"/>
-         <Tool
-            Name="VCLinkerTool"
-            AdditionalDependencies="winmm.lib"
-            OutputFile="$(OutDir)/insert_vs_emplace_test.exe"
-            LinkIncremental="1"
-            AdditionalLibraryDirectories="../../../../stage/lib"
-            GenerateDebugInformation="TRUE"
-            SubSystem="1"
-            OptimizeReferences="2"
-            EnableCOMDATFolding="2"
-            TargetMachine="1"/>
-         <Tool
-            Name="VCMIDLTool"/>
-         <Tool
-            Name="VCPostBuildEventTool"/>
-         <Tool
-            Name="VCPreBuildEventTool"/>
-         <Tool
-            Name="VCPreLinkEventTool"/>
-         <Tool
-            Name="VCResourceCompilerTool"/>
-         <Tool
-            Name="VCWebServiceProxyGeneratorTool"/>
-         <Tool
-            Name="VCXMLDataGeneratorTool"/>
-         <Tool
-            Name="VCWebDeploymentTool"/>
-         <Tool
-            Name="VCManagedWrapperGeneratorTool"/>
-         <Tool
-            Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-      </Configuration>
-   </Configurations>
-   <References>
-   </References>
-   <Files>
-      <Filter
-         Name="Source Files"
-         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-         UniqueIdentifier="{4CBB737A-CAC8-16C6-1243-3D2AA35F127D}">
-         <File
-            RelativePath="..\..\bench\insert_vs_emplace_test.cpp">
-         </File>
-      </Filter>
-   </Files>
-   <Globals>
-   </Globals>
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="insert_vs_emplace_test"
+	ProjectGUID="{51EC9223-B8A9-4F6E-EA24-352DFA76C72A}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../Bin/Win32/Debug"
+			IntermediateDirectory="Debug/insert_vs_emplace_test"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="$(OutDir)/insert_vs_emplace_test_d.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../stage/lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/insert_vs_emplace_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../Bin/Win32/Release"
+			IntermediateDirectory="Release/insert_vs_emplace_test"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="$(OutDir)/insert_vs_emplace_test.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../stage/lib"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4CBB737A-CAC8-16C6-1243-3D2AA35F127D}">
+			<File
+				RelativePath="..\..\test\insert_vs_emplace_test.cpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
diff --git a/proj/vc7ide/list_test.vcproj b/proj/vc7ide/list_test.vcproj
index 4cc1522..3ebaf1b 100644
--- a/proj/vc7ide/list_test.vcproj
+++ b/proj/vc7ide/list_test.vcproj
@@ -1,140 +1,136 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-   ProjectType="Visual C++"
-   Version="7.10"
-   Name="list_test"
-   ProjectGUID="{58CCE183-6092-48FE-A4F7-BA0D3A792632}"
-   Keyword="Win32Proj">
-   <Platforms>
-      <Platform
-         Name="Win32"/>
-   </Platforms>
-   <Configurations>
-      <Configuration
-         Name="Debug|Win32"
-         OutputDirectory="../../Bin/Win32/Debug"
-         IntermediateDirectory="Debug/list_ex"
-         ConfigurationType="1"
-         CharacterSet="2">
-         <Tool
-            Name="VCCLCompilerTool"
-            Optimization="0"
-            AdditionalIncludeDirectories="../../../.."
-            PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-            GeneratePreprocessedFile="0"
-            KeepComments="FALSE"
-            MinimalRebuild="TRUE"
-            BasicRuntimeChecks="3"
-            RuntimeLibrary="3"
-            TreatWChar_tAsBuiltInType="TRUE"
-            ForceConformanceInForLoopScope="FALSE"
-            UsePrecompiledHeader="0"
-            WarningLevel="4"
-            Detect64BitPortabilityProblems="TRUE"
-            DebugInformationFormat="3"/>
-         <Tool
-            Name="VCCustomBuildTool"/>
-         <Tool
-            Name="VCLinkerTool"
-            AdditionalDependencies="winmm.lib"
-            OutputFile="$(OutDir)/list_ex_d.exe"
-            LinkIncremental="1"
-            AdditionalLibraryDirectories="../../../../stage/lib"
-            GenerateDebugInformation="TRUE"
-            ProgramDatabaseFile="$(OutDir)/list_ex.pdb"
-            SubSystem="1"
-            TargetMachine="1"
-            FixedBaseAddress="1"/>
-         <Tool
-            Name="VCMIDLTool"/>
-         <Tool
-            Name="VCPostBuildEventTool"/>
-         <Tool
-            Name="VCPreBuildEventTool"/>
-         <Tool
-            Name="VCPreLinkEventTool"/>
-         <Tool
-            Name="VCResourceCompilerTool"/>
-         <Tool
-            Name="VCWebServiceProxyGeneratorTool"/>
-         <Tool
-            Name="VCXMLDataGeneratorTool"/>
-         <Tool
-            Name="VCWebDeploymentTool"/>
-         <Tool
-            Name="VCManagedWrapperGeneratorTool"/>
-         <Tool
-            Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-      </Configuration>
-      <Configuration
-         Name="Release|Win32"
-         OutputDirectory="../../Bin/Win32/Release"
-         IntermediateDirectory="Release/list_ex"
-         ConfigurationType="1"
-         CharacterSet="2">
-         <Tool
-            Name="VCCLCompilerTool"
-            AdditionalIncludeDirectories="../../../.."
-            PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-            RuntimeLibrary="2"
-            TreatWChar_tAsBuiltInType="TRUE"
-            ForceConformanceInForLoopScope="FALSE"
-            UsePrecompiledHeader="0"
-            WarningLevel="4"
-            Detect64BitPortabilityProblems="TRUE"
-            DebugInformationFormat="0"/>
-         <Tool
-            Name="VCCustomBuildTool"/>
-         <Tool
-            Name="VCLinkerTool"
-            AdditionalDependencies="winmm.lib"
-            OutputFile="$(OutDir)/list_ex.exe"
-            LinkIncremental="1"
-            AdditionalLibraryDirectories="../../../../stage/lib"
-            GenerateDebugInformation="TRUE"
-            SubSystem="1"
-            OptimizeReferences="2"
-            EnableCOMDATFolding="2"
-            TargetMachine="1"/>
-         <Tool
-            Name="VCMIDLTool"/>
-         <Tool
-            Name="VCPostBuildEventTool"/>
-         <Tool
-            Name="VCPreBuildEventTool"/>
-         <Tool
-            Name="VCPreLinkEventTool"/>
-         <Tool
-            Name="VCResourceCompilerTool"/>
-         <Tool
-            Name="VCWebServiceProxyGeneratorTool"/>
-         <Tool
-            Name="VCXMLDataGeneratorTool"/>
-         <Tool
-            Name="VCWebDeploymentTool"/>
-         <Tool
-            Name="VCManagedWrapperGeneratorTool"/>
-         <Tool
-            Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-      </Configuration>
-   </Configurations>
-   <References>
-   </References>
-   <Files>
-      <Filter
-         Name="Source Files"
-         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-         <File
-            RelativePath="..\..\test\list_test.cpp">
-         </File>
-      </Filter>
-      <Filter
-         Name="Header Files"
-         Filter="h;hpp;hxx;hm;inl;inc;xsd"
-         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      </Filter>
-   </Files>
-   <Globals>
-   </Globals>
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="list_test"
+	ProjectGUID="{58CCE183-6092-48FE-A4F7-BA0D3A792632}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../Bin/Win32/Debug"
+			IntermediateDirectory="Debug/list_test"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				GeneratePreprocessedFile="0"
+				KeepComments="FALSE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="$(OutDir)/list_test_d.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../stage/lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/list_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../Bin/Win32/Release"
+			IntermediateDirectory="Release/list_test"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="$(OutDir)/list_test.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../stage/lib"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\test\list_test.cpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
diff --git a/proj/vc7ide/map_test.vcproj b/proj/vc7ide/map_test.vcproj
index 64f84de..d702391 100644
--- a/proj/vc7ide/map_test.vcproj
+++ b/proj/vc7ide/map_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/map_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/pair_test.vcproj b/proj/vc7ide/pair_test.vcproj
index 6dcce65..0b29eb8 100644
--- a/proj/vc7ide/pair_test.vcproj
+++ b/proj/vc7ide/pair_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/pair_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/scoped_allocator_adaptor.vcproj b/proj/vc7ide/scoped_allocator_adaptor.vcproj
index cad49d2..451d6dd 100644
--- a/proj/vc7ide/scoped_allocator_adaptor.vcproj
+++ b/proj/vc7ide/scoped_allocator_adaptor.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/scoped_allocator_adaptor_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/scoped_allocator_usage_test.vcproj b/proj/vc7ide/scoped_allocator_usage_test.vcproj
index 2083b5a..4faf10f 100644
--- a/proj/vc7ide/scoped_allocator_usage_test.vcproj
+++ b/proj/vc7ide/scoped_allocator_usage_test.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/scoped_allocator_usage_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/set_test.vcproj b/proj/vc7ide/set_test.vcproj
index 4b8c57f..98ae093 100644
--- a/proj/vc7ide/set_test.vcproj
+++ b/proj/vc7ide/set_test.vcproj
@@ -1,133 +1,134 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-   ProjectType="Visual C++"
-   Version="7.10"
-   Name="set_test"
-   ProjectGUID="{58CCE183-6092-48FE-A4F7-BA0D3A792606}"
-   Keyword="Win32Proj">
-   <Platforms>
-      <Platform
-         Name="Win32"/>
-   </Platforms>
-   <Configurations>
-      <Configuration
-         Name="Debug|Win32"
-         OutputDirectory="../../Bin/Win32/Debug"
-         IntermediateDirectory="Debug/set_test"
-         ConfigurationType="1"
-         CharacterSet="2">
-         <Tool
-            Name="VCCLCompilerTool"
-            Optimization="0"
-            AdditionalIncludeDirectories="../../../.."
-            PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-            MinimalRebuild="TRUE"
-            BasicRuntimeChecks="3"
-            RuntimeLibrary="3"
-            TreatWChar_tAsBuiltInType="TRUE"
-            ForceConformanceInForLoopScope="FALSE"
-            UsePrecompiledHeader="0"
-            WarningLevel="4"
-            Detect64BitPortabilityProblems="TRUE"
-            DebugInformationFormat="3"/>
-         <Tool
-            Name="VCCustomBuildTool"/>
-         <Tool
-            Name="VCLinkerTool"
-            AdditionalDependencies="winmm.lib"
-            OutputFile="$(OutDir)/set_test_d.exe"
-            LinkIncremental="1"
-            AdditionalLibraryDirectories="../../../../stage/lib"
-            GenerateDebugInformation="TRUE"
-            ProgramDatabaseFile="$(OutDir)/set_test.pdb"
-            SubSystem="1"
-            TargetMachine="1"
-            FixedBaseAddress="1"/>
-         <Tool
-            Name="VCMIDLTool"/>
-         <Tool
-            Name="VCPostBuildEventTool"/>
-         <Tool
-            Name="VCPreBuildEventTool"/>
-         <Tool
-            Name="VCPreLinkEventTool"/>
-         <Tool
-            Name="VCResourceCompilerTool"/>
-         <Tool
-            Name="VCWebServiceProxyGeneratorTool"/>
-         <Tool
-            Name="VCXMLDataGeneratorTool"/>
-         <Tool
-            Name="VCWebDeploymentTool"/>
-         <Tool
-            Name="VCManagedWrapperGeneratorTool"/>
-         <Tool
-            Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-      </Configuration>
-      <Configuration
-         Name="Release|Win32"
-         OutputDirectory="../../Bin/Win32/Release"
-         IntermediateDirectory="Release/set_test"
-         ConfigurationType="1"
-         CharacterSet="2">
-         <Tool
-            Name="VCCLCompilerTool"
-            AdditionalIncludeDirectories="../../../.."
-            PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-            RuntimeLibrary="2"
-            TreatWChar_tAsBuiltInType="TRUE"
-            ForceConformanceInForLoopScope="FALSE"
-            UsePrecompiledHeader="0"
-            WarningLevel="4"
-            Detect64BitPortabilityProblems="TRUE"
-            DebugInformationFormat="0"/>
-         <Tool
-            Name="VCCustomBuildTool"/>
-         <Tool
-            Name="VCLinkerTool"
-            AdditionalDependencies="winmm.lib"
-            OutputFile="$(OutDir)/set_test.exe"
-            LinkIncremental="1"
-            AdditionalLibraryDirectories="../../../../stage/lib"
-            GenerateDebugInformation="TRUE"
-            SubSystem="1"
-            OptimizeReferences="2"
-            EnableCOMDATFolding="2"
-            TargetMachine="1"/>
-         <Tool
-            Name="VCMIDLTool"/>
-         <Tool
-            Name="VCPostBuildEventTool"/>
-         <Tool
-            Name="VCPreBuildEventTool"/>
-         <Tool
-            Name="VCPreLinkEventTool"/>
-         <Tool
-            Name="VCResourceCompilerTool"/>
-         <Tool
-            Name="VCWebServiceProxyGeneratorTool"/>
-         <Tool
-            Name="VCXMLDataGeneratorTool"/>
-         <Tool
-            Name="VCWebDeploymentTool"/>
-         <Tool
-            Name="VCManagedWrapperGeneratorTool"/>
-         <Tool
-            Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-      </Configuration>
-   </Configurations>
-   <References>
-   </References>
-   <Files>
-      <Filter
-         Name="Source Files"
-         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-         <File
-            RelativePath="..\..\test\set_test.cpp">
-         </File>
-      </Filter>
-   </Files>
-   <Globals>
-   </Globals>
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="set_test"
+	ProjectGUID="{58CCE183-6092-48FE-A4F7-BA0D3A792606}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../Bin/Win32/Debug"
+			IntermediateDirectory="Debug/set_test"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="$(OutDir)/set_test_d.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../stage/lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/set_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../Bin/Win32/Release"
+			IntermediateDirectory="Release/set_test"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="FALSE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="$(OutDir)/set_test.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../stage/lib"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+				FixedBaseAddress="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\test\set_test.cpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
diff --git a/proj/vc7ide/slist_test.vcproj b/proj/vc7ide/slist_test.vcproj
index 125160d..47c7011 100644
--- a/proj/vc7ide/slist_test.vcproj
+++ b/proj/vc7ide/slist_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/slist_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/stable_vector_test.vcproj b/proj/vc7ide/stable_vector_test.vcproj
index 80bc165..9c4a7c0 100644
--- a/proj/vc7ide/stable_vector_test.vcproj
+++ b/proj/vc7ide/stable_vector_test.vcproj
@@ -42,7 +42,8 @@
             ProgramDatabaseFile="$(OutDir)/stable_vector_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -93,7 +94,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/static_vector_test.vcproj b/proj/vc7ide/static_vector_test.vcproj
index 2ebef4b..7da628a 100644
--- a/proj/vc7ide/static_vector_test.vcproj
+++ b/proj/vc7ide/static_vector_test.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/static_vector_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/string_test.vcproj b/proj/vc7ide/string_test.vcproj
index df695fa..f70f756 100644
--- a/proj/vc7ide/string_test.vcproj
+++ b/proj/vc7ide/string_test.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/string_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/throw_exception_test.vcproj b/proj/vc7ide/throw_exception_test.vcproj
index a496a8a..88d3de3 100644
--- a/proj/vc7ide/throw_exception_test.vcproj
+++ b/proj/vc7ide/throw_exception_test.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/throw_exception_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool
diff --git a/proj/vc7ide/vector_test.vcproj b/proj/vc7ide/vector_test.vcproj
index 76f677a..af7b6af 100644
--- a/proj/vc7ide/vector_test.vcproj
+++ b/proj/vc7ide/vector_test.vcproj
@@ -43,7 +43,8 @@
             ProgramDatabaseFile="$(OutDir)/vector_test.pdb"
             SubSystem="1"
             TargetMachine="1"
-            FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+            />
          <Tool
             Name="VCMIDLTool"/>
          <Tool
@@ -94,7 +95,8 @@
             SubSystem="1"
             OptimizeReferences="2"
             EnableCOMDATFolding="2"
-            TargetMachine="1"/>
+            TargetMachine="1"
+				FixedBaseAddress="1"/>
          <Tool
             Name="VCMIDLTool"/>
          <Tool