diff --git a/openfpga/src/annotation/annotate_rr_graph.cpp b/openfpga/src/annotation/annotate_rr_graph.cpp
index 3815c6305..774db988f 100644
--- a/openfpga/src/annotation/annotate_rr_graph.cpp
+++ b/openfpga/src/annotation/annotate_rr_graph.cpp
@@ -11,7 +11,7 @@
 #include "openfpga_side_manager.h"
 
 /* Headers from vpr library */
-#include "rr_graph_obj_util.h"
+#include "rr_graph_obj_utils.h"
 #include "openfpga_rr_graph_utils.h"
 
 #include "annotate_rr_graph.h"
diff --git a/openfpga/src/annotation/vpr_routing_annotation.cpp b/openfpga/src/annotation/vpr_routing_annotation.cpp
index e0014638f..4c651500a 100644
--- a/openfpga/src/annotation/vpr_routing_annotation.cpp
+++ b/openfpga/src/annotation/vpr_routing_annotation.cpp
@@ -33,7 +33,7 @@ RRNodeId VprRoutingAnnotation::rr_node_prev_node(const RRNodeId& rr_node) const
 /************************************************************************
  * Public mutators
  ***********************************************************************/
-void VprRoutingAnnotation::init(const RRGraph& rr_graph) {
+void VprRoutingAnnotation::init(const RRGraphView& rr_graph) {
   rr_node_nets_.resize(rr_graph.nodes().size(), ClusterNetId::INVALID());
   rr_node_prev_nodes_.resize(rr_graph.nodes().size(), RRNodeId::INVALID());
 }
diff --git a/openfpga/src/annotation/vpr_routing_annotation.h b/openfpga/src/annotation/vpr_routing_annotation.h
index e22f04e5b..dae095d23 100644
--- a/openfpga/src/annotation/vpr_routing_annotation.h
+++ b/openfpga/src/annotation/vpr_routing_annotation.h
@@ -7,7 +7,9 @@
 #include <map> 
 
 /* Header from vpr library */
-#include "vpr_context.h"
+#include "vtr_vector.h"
+#include "clustered_netlist_fwd.h"
+#include "rr_graph_view.h"
 
 /* Begin namespace openfpga */
 namespace openfpga {
@@ -28,7 +30,7 @@ class VprRoutingAnnotation {
     ClusterNetId rr_node_net(const RRNodeId& rr_node) const;
     RRNodeId rr_node_prev_node(const RRNodeId& rr_node) const;
   public:  /* Public mutators */
-    void init(const RRGraph& rr_graph);
+    void init(const RRGraphView& rr_graph);
     void set_rr_node_net(const RRNodeId& rr_node,
                          const ClusterNetId& net_id);
     void set_rr_node_prev_node(const RRNodeId& rr_node,
diff --git a/openfpga/src/ctag_src.sh b/openfpga/src/ctag_src.sh
index e36d842ea..a45afa299 100644
--- a/openfpga/src/ctag_src.sh
+++ b/openfpga/src/ctag_src.sh
@@ -1 +1,2 @@
-ctags -R . ../../libopenfpga/*/src/* ../../libs/*/src/* ../../vpr/src/*/*
+ctags -R . ../../libopenfpga/*/src/* ../../vtr-verilog-to-routing/libs/*/src/* ../../vtr-verilog-to-routing/libs/*/src/*/* ../../vtr-verilog-to-routing/vpr/src/*/*
+
diff --git a/openfpga/src/repack/lb_rr_graph.h b/openfpga/src/repack/lb_rr_graph.h
index b4d4a093a..6edc0fbce 100644
--- a/openfpga/src/repack/lb_rr_graph.h
+++ b/openfpga/src/repack/lb_rr_graph.h
@@ -151,7 +151,7 @@
 #include "physical_types.h"
 
 /* Header from vpr library */
-#include "lb_rr_graph_types.h"
+#include "pack_types.h"
 
 #include "lb_rr_graph_fwd.h"