diff --git a/openfpga/src/base/openfpga_build_fabric_template.h b/openfpga/src/base/openfpga_build_fabric_template.h
index 42e7f1857..d3a3204aa 100644
--- a/openfpga/src/base/openfpga_build_fabric_template.h
+++ b/openfpga/src/base/openfpga_build_fabric_template.h
@@ -339,8 +339,8 @@ int add_fpga_core_to_fabric_template(T& openfpga_ctx, const Command& cmd,
   }
 
   return add_fpga_core_to_device_module_graph(
-    openfpga_ctx.mutable_module_graph(), openfpga_ctx.mutable_module_name_map(), openfpga_ctx.io_name_map(),
-    core_inst_name, frame_view, verbose_output);
+    openfpga_ctx.mutable_module_graph(), openfpga_ctx.mutable_module_name_map(),
+    openfpga_ctx.io_name_map(), core_inst_name, frame_view, verbose_output);
 }
 
 /********************************************************************
diff --git a/openfpga/src/fabric/build_fpga_core_wrapper_module.cpp b/openfpga/src/fabric/build_fpga_core_wrapper_module.cpp
index 9b5bb6f53..a118dbe83 100644
--- a/openfpga/src/fabric/build_fpga_core_wrapper_module.cpp
+++ b/openfpga/src/fabric/build_fpga_core_wrapper_module.cpp
@@ -341,7 +341,8 @@ int add_fpga_core_to_device_module_graph(ModuleManager& module_manager,
   int status = CMD_EXEC_SUCCESS;
 
   /* Execute the module graph api */
-  std::string top_module_name = module_name_map.name(generate_fpga_top_module_name());
+  std::string top_module_name =
+    module_name_map.name(generate_fpga_top_module_name());
   ModuleId top_module = module_manager.find_module(top_module_name);
   if (!module_manager.valid_module_id(top_module)) {
     return CMD_EXEC_FATAL_ERROR;
@@ -381,10 +382,12 @@ int add_fpga_core_to_device_module_graph(ModuleManager& module_manager,
            top_module_name.c_str(), core_module_name.c_str());
 
   /* Update module name map */
-  status = module_name_map.set_tag_to_name_pair(core_module_name, core_module_name);
+  status =
+    module_name_map.set_tag_to_name_pair(core_module_name, core_module_name);
   if (CMD_EXEC_SUCCESS != status) {
-    VTR_LOG_ERROR("Failed to register fpga core module '%s' in module name map!\n",
-                  core_module_name.c_str());
+    VTR_LOG_ERROR(
+      "Failed to register fpga core module '%s' in module name map!\n",
+      core_module_name.c_str());
     return CMD_EXEC_FATAL_ERROR;
   }
   VTR_LOGV(verbose, "Updated module name map\n");
diff --git a/openfpga/src/fabric/build_fpga_core_wrapper_module.h b/openfpga/src/fabric/build_fpga_core_wrapper_module.h
index 320758054..3c068db56 100644
--- a/openfpga/src/fabric/build_fpga_core_wrapper_module.h
+++ b/openfpga/src/fabric/build_fpga_core_wrapper_module.h
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "io_name_map.h"
-#include "module_name_map.h"
 #include "module_manager.h"
+#include "module_name_map.h"
 
 /********************************************************************
  * Function declaration