diff --git a/vpr/src/place/compressed_grid.h b/vpr/src/place/compressed_grid.h
index 6f9575fb67..8d6ecd9097 100644
--- a/vpr/src/place/compressed_grid.h
+++ b/vpr/src/place/compressed_grid.h
@@ -5,7 +5,6 @@
 #include "physical_types.h"
 
 #include "vtr_assert.h"
-#include "vtr_geometry.h"
 #include "vtr_flat_map.h"
 
 struct t_compressed_block_grid {
diff --git a/vpr/src/place/grid_tile_lookup.cpp b/vpr/src/place/grid_tile_lookup.cpp
index 45aad72964..aef14f286a 100644
--- a/vpr/src/place/grid_tile_lookup.cpp
+++ b/vpr/src/place/grid_tile_lookup.cpp
@@ -1,4 +1,5 @@
 #include "grid_tile_lookup.h"
+#include "globals.h"
 #include "physical_types_util.h"
 
 GridTileLookup::GridTileLookup()
diff --git a/vpr/src/place/grid_tile_lookup.h b/vpr/src/place/grid_tile_lookup.h
index b155bf9941..74b858d623 100644
--- a/vpr/src/place/grid_tile_lookup.h
+++ b/vpr/src/place/grid_tile_lookup.h
@@ -1,8 +1,11 @@
 #ifndef VPR_SRC_PLACE_GRID_TILE_LOOKUP_H_
 #define VPR_SRC_PLACE_GRID_TILE_LOOKUP_H_
 
-#include "place_util.h"
-#include "globals.h"
+#include <vector>
+#include "physical_types.h"
+#include "vtr_ndmatrix.h"
+
+class Region;
 
 /**
  * @class GridTileLookup
diff --git a/vpr/src/place/initial_noc_placement.cpp b/vpr/src/place/initial_noc_placement.cpp
index 2c97ee4f78..40376e3a18 100644
--- a/vpr/src/place/initial_noc_placement.cpp
+++ b/vpr/src/place/initial_noc_placement.cpp
@@ -8,13 +8,8 @@
 #include "noc_place_checkpoint.h"
 #include "place_constraints.h"
 
-#include "sat_routing.h"
-
-#include "vtr_math.h"
 #include "vtr_time.h"
 
-#include <queue>
-
 /**
  * @brief Evaluates whether a NoC router swap should be accepted or not.
  * If delta cost is non-positive, the move is always accepted. If the cost
diff --git a/vpr/src/place/move_transactions.h b/vpr/src/place/move_transactions.h
index ce1095c365..78cde262e5 100644
--- a/vpr/src/place/move_transactions.h
+++ b/vpr/src/place/move_transactions.h
@@ -2,7 +2,6 @@
 #define VPR_MOVE_TRANSACTIONS_H
 
 #include "vpr_types.h"
-#include "clustered_netlist_utils.h"
 
 class BlkLocRegistry;
 class GridBlock;
diff --git a/vpr/src/place/move_utils.cpp b/vpr/src/place/move_utils.cpp
index f3cc457d0b..88dd550577 100644
--- a/vpr/src/place/move_utils.cpp
+++ b/vpr/src/place/move_utils.cpp
@@ -7,9 +7,6 @@
 #include "place_macro.h"
 #include "vtr_random.h"
 
-#include "draw_debug.h"
-#include "draw.h"
-
 #include "place_constraints.h"
 #include "placer_state.h"
 #include "PlacerCriticalities.h"
diff --git a/vpr/src/place/noc_place_checkpoint.h b/vpr/src/place/noc_place_checkpoint.h
index e794e3e2d6..963acee281 100644
--- a/vpr/src/place/noc_place_checkpoint.h
+++ b/vpr/src/place/noc_place_checkpoint.h
@@ -1,8 +1,6 @@
 #ifndef VTR_ROUTERPLACEMENTCHECKPOINT_H
 #define VTR_ROUTERPLACEMENTCHECKPOINT_H
 
-class NocCostHandler;
-
 /**
  * @brief NoC router placement checkpoint
  *
@@ -20,6 +18,8 @@ class NocCostHandler;
 #include "vpr_types.h"
 #include "place_util.h"
 
+class NocCostHandler;
+
 /**
  * @brief A NoC router placement checkpoint
  *
diff --git a/vpr/src/place/place_checkpoint.h b/vpr/src/place/place_checkpoint.h
index 9a3fe76d5d..86700c9dd4 100644
--- a/vpr/src/place/place_checkpoint.h
+++ b/vpr/src/place/place_checkpoint.h
@@ -1,11 +1,9 @@
 #ifndef PLACE_CHECKPOINT_H
 #define PLACE_CHECKPOINT_H
 
-#include "vtr_util.h"
 #include "vpr_types.h"
 #include "vtr_vector_map.h"
 #include "place_util.h"
-#include "globals.h"
 #include "timing_info.h"
 
 #include "place_delay_model.h"
diff --git a/vpr/src/place/place_constraints.h b/vpr/src/place/place_constraints.h
index 7795214479..b1d2b5a556 100644
--- a/vpr/src/place/place_constraints.h
+++ b/vpr/src/place/place_constraints.h
@@ -8,9 +8,9 @@
  *  Created on: Mar. 1, 2021
  *      Author: khalid88
  */
+#include "globals.h"
 #include "move_transactions.h"
 #include "region.h"
-#include "clustered_netlist_utils.h"
 #include "partition_region.h"
 #include "place_macro.h"
 #include "grid_tile_lookup.h"
diff --git a/vpr/src/place/place_util.h b/vpr/src/place/place_util.h
index 6faa963106..f21761b9e3 100644
--- a/vpr/src/place/place_util.h
+++ b/vpr/src/place/place_util.h
@@ -7,11 +7,7 @@
 #ifndef PLACE_UTIL_H
 #define PLACE_UTIL_H
 
-#include <string>
-
 #include "vpr_types.h"
-#include "vtr_util.h"
-#include "vtr_vector_map.h"
 #include "globals.h"
 
 /**
diff --git a/vpr/src/place/placement_log_printer.h b/vpr/src/place/placement_log_printer.h
index e349fbe051..56d1883507 100644
--- a/vpr/src/place/placement_log_printer.h
+++ b/vpr/src/place/placement_log_printer.h
@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include <cstddef>
 #include <vector>
 
 #include "timing_info_fwd.h"
diff --git a/vpr/src/place/placer_breakpoint.cpp b/vpr/src/place/placer_breakpoint.cpp
index d71430f209..4ca967ab85 100644
--- a/vpr/src/place/placer_breakpoint.cpp
+++ b/vpr/src/place/placer_breakpoint.cpp
@@ -1,4 +1,9 @@
 #include "placer_breakpoint.h"
+#include "breakpoint_state_globals.h"
+#include "draw.h"
+#include "draw_debug.h"
+#include "draw_global.h"
+#include "vtr_expr_eval.h"
 
 //map of the available move types and their corresponding type number
 std::map<int, std::string> available_move_types = {
diff --git a/vpr/src/place/placer_breakpoint.h b/vpr/src/place/placer_breakpoint.h
index 159e9c40b3..d23e927ae7 100644
--- a/vpr/src/place/placer_breakpoint.h
+++ b/vpr/src/place/placer_breakpoint.h
@@ -1,11 +1,7 @@
 
 #pragma once
 
-#include "globals.h"
-#include "vpr_types.h"
 #include "move_utils.h"
-#include "breakpoint.h"
-#include "draw.h"
 
 //transforms the vector moved_blocks to a vector of ints and adds it in glob_breakpoint_state
 void transform_blocks_affected(const t_pl_blocks_to_be_moved& blocksAffected);