diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/Testing/Cxx/TestBoostAdapter.cxx
index 6af2855..484a9e0 100644
--- a/Infovis/Testing/Cxx/TestBoostAdapter.cxx
+++ b/Infovis/Testing/Cxx/TestBoostAdapter.cxx
@@ -36,8 +36,8 @@
 #include <boost/graph/strong_components.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/transitive_closure.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 
 #include "vtkGraph.h"
 #include "vtkBoostGraphAdapter.h"
diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx
index 6799dd0..dd759d5 100644
--- a/Infovis/vtkBoostBiconnectedComponents.cxx
+++ b/Infovis/vtkBoostBiconnectedComponents.cxx
@@ -32,7 +32,7 @@
 #include "vtkGraph.h"
 #include "vtkBoostGraphAdapter.h"
 #include <boost/graph/biconnected_components.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/version.hpp>
 #include <vtksys/stl/vector>
 #include <vtksys/stl/utility>
diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx
index e214a72..443c039 100644
--- a/Infovis/vtkBoostBrandesCentrality.cxx
+++ b/Infovis/vtkBoostBrandesCentrality.cxx
@@ -36,7 +36,7 @@
 
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/betweenness_centrality.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 
 using namespace boost;
 
diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx
index 7fab585..6e56a7c 100644
--- a/Infovis/vtkBoostBreadthFirstSearch.cxx
+++ b/Infovis/vtkBoostBreadthFirstSearch.cxx
@@ -46,8 +46,8 @@
 
 #include <boost/graph/visitors.hpp>
 #include <boost/graph/breadth_first_search.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 #include <vtksys/stl/utility> // for pair
diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
index 5c64516..64ee7b5 100644
--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
@@ -39,7 +39,7 @@
 #include "vtkTree.h"
 
 #include <boost/graph/breadth_first_search.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 using namespace boost;
diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx
index 69e9d8f..c88f4ab 100644
--- a/Infovis/vtkBoostConnectedComponents.cxx
+++ b/Infovis/vtkBoostConnectedComponents.cxx
@@ -33,7 +33,7 @@
 
 #include "vtkBoostGraphAdapter.h"
 #include <boost/graph/strong_components.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 
 using namespace boost;
 
diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
index b0c89de..7ea3aa9 100644
--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
+++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
@@ -40,7 +40,7 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkTree.h"
 
 #include <boost/graph/kruskal_min_spanning_tree.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 using namespace boost;
diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
index 935d0f7..48716fd 100644
--- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
+++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
@@ -39,7 +39,7 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkTree.h"
 
 #include <boost/graph/prim_minimum_spanning_tree.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 using namespace boost;
diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
index 6efa586..222afe9 100644
--- a/Infovis/vtkTreeLayoutStrategy.cxx
+++ b/Infovis/vtkTreeLayoutStrategy.cxx
@@ -375,8 +375,8 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent)
 #include "vtkTreeToBoostAdapter.h"
 #include <boost/graph/visitors.hpp>
 #include <boost/graph/depth_first_search.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 using namespace boost;
diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx
index 2b4681b..eebeaa9 100644
--- a/Parallel/vtkPBGLBreadthFirstSearch.cxx
+++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx
@@ -50,8 +50,8 @@
 #include <boost/graph/distributed/breadth_first_search.hpp>
 #include <boost/parallel/algorithm.hpp>
 #include <boost/graph/visitors.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 #include <vtksys/stl/utility> // for pair
diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Parallel/vtkPBGLGraphAdapter.h
index 7b467b0..bacfd3a 100644
--- a/Parallel/vtkPBGLGraphAdapter.h
+++ b/Parallel/vtkPBGLGraphAdapter.h
@@ -31,7 +31,7 @@
 #include <boost/graph/distributed/mpi_process_group.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/graph/parallel/container_traits.hpp>
-#include <boost/parallel/local_property_map.hpp>
+#include <boost/property_map/parallel/local_property_map.hpp>
 #include <boost/serialization/base_object.hpp>
 #include <boost/functional/hash.hpp>
 //ETX
diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx
index da4647e..f9c3229 100644
--- a/Parallel/vtkPBGLMinimumSpanningTree.cxx
+++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx
@@ -48,8 +48,8 @@
 #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp>
 #include <boost/graph/distributed/vertex_list_adaptor.hpp>
 #include <boost/parallel/global_index_map.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 #include <vtksys/stl/utility> // for pair
diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx
index 074143f..8517304 100644
--- a/Parallel/vtkPBGLShortestPaths.cxx
+++ b/Parallel/vtkPBGLShortestPaths.cxx
@@ -49,8 +49,8 @@
 
 #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp>
 #include <boost/parallel/algorithm.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 
 #include <vtksys/stl/utility> // for pair
 
diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx
index 9aa87a0..301a245 100644
--- a/Parallel/vtkPBGLVertexColoring.cxx
+++ b/Parallel/vtkPBGLVertexColoring.cxx
@@ -47,7 +47,7 @@
 
 #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp>
 #include <boost/parallel/algorithm.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
 
 #include <vtksys/stl/utility> // for pair