diff --git a/openfpga/src/annotation/vpr_device_annotation.h b/openfpga/src/annotation/vpr_device_annotation.h
index 734f62b66..5f591bf5f 100644
--- a/openfpga/src/annotation/vpr_device_annotation.h
+++ b/openfpga/src/annotation/vpr_device_annotation.h
@@ -12,9 +12,6 @@
 /* Header from archfpga library */
 #include "physical_types.h"
 
-/* Header from vpr library */
-#include "rr_graph_obj.h"
-
 /* Header from openfpgautil library */
 #include "openfpga_port.h"
 #include "circuit_library.h"
diff --git a/openfpga/src/annotation/write_xml_device_rr_gsb.h b/openfpga/src/annotation/write_xml_device_rr_gsb.h
index 98c651e62..a74a135b3 100644
--- a/openfpga/src/annotation/write_xml_device_rr_gsb.h
+++ b/openfpga/src/annotation/write_xml_device_rr_gsb.h
@@ -5,9 +5,9 @@
  * Include header files that are required by function declaration
  *******************************************************************/
 #include <string>
-#include "rr_graph_obj.h"
 #include "device_grid.h"
 #include "vpr_device_annotation.h"
+#include "rr_graph_view.h"
 #include "device_rr_gsb.h"
 
 /********************************************************************
diff --git a/openfpga/src/fpga_sdc/analysis_sdc_writer_utils.h b/openfpga/src/fpga_sdc/analysis_sdc_writer_utils.h
index 3e5582f94..fa757622a 100644
--- a/openfpga/src/fpga_sdc/analysis_sdc_writer_utils.h
+++ b/openfpga/src/fpga_sdc/analysis_sdc_writer_utils.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <map>
 #include "module_manager.h"
-#include "rr_graph_obj.h"
+#include "rr_graph_fwd.h"
 #include "atom_netlist_fwd.h"
 #include "vpr_routing_annotation.h"
 
diff --git a/vtr-verilog-to-routing b/vtr-verilog-to-routing
index 43a80a46b..4c2b47e48 160000
--- a/vtr-verilog-to-routing
+++ b/vtr-verilog-to-routing
@@ -1 +1 @@
-Subproject commit 43a80a46bd3c9dc2702c0e225e30663d2fad3401
+Subproject commit 4c2b47e484110f6b4f5cc6f602e0d6f9c220fb2d