Merge pull request #9055 from hzeller/feature-20251216-fix-inc

maliberty · web-flow · commit 886a8e6629df · 2025-12-17T16:08:38.000Z
Fix a few includes and associaetd BUILD deps.
diff --git a/src/cts/src/CtsGraphics.cpp b/src/cts/src/CtsGraphics.cpp
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "Util.h"
 #include "gui/gui.h"
 #include "odb/geom.h"
 #include "utl/Logger.h"
diff --git a/src/cts/src/CtsGraphics.h b/src/cts/src/CtsGraphics.h
@@ -11,6 +11,7 @@
 #include "CtsObserver.h"
 #include "HTreeBuilder.h"
 #include "SinkClustering.h"
+#include "Util.h"
 #include "gui/gui.h"
 
 namespace utl {
diff --git a/src/cts/src/CtsObserver.h b/src/cts/src/CtsObserver.h
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "Clock.h"
+#include "Util.h"
 
 namespace cts {
 
diff --git a/src/cts/src/HTreeBuilder.cpp b/src/cts/src/HTreeBuilder.cpp
@@ -14,6 +14,7 @@
 
 #include "Clustering.h"
 #include "SinkClustering.h"
+#include "Util.h"
 #include "odb/db.h"
 #include "odb/isotropy.h"
 #include "utl/Logger.h"
diff --git a/src/cts/src/HTreeBuilder.h b/src/cts/src/HTreeBuilder.h
@@ -14,6 +14,7 @@
 #include "CtsObserver.h"
 #include "CtsOptions.h"
 #include "TreeBuilder.h"
+#include "Util.h"
 #include "odb/db.h"
 #include "odb/isotropy.h"
 
diff --git a/src/cts/src/LatencyBalancer.cpp b/src/cts/src/LatencyBalancer.cpp
@@ -16,6 +16,7 @@
 #include "Clock.h"
 #include "CtsOptions.h"
 #include "TreeBuilder.h"
+#include "Util.h"
 #include "cts/TritonCTS.h"
 #include "odb/db.h"
 #include "odb/dbSet.h"
diff --git a/src/cts/src/SinkClustering.cpp b/src/cts/src/SinkClustering.cpp
@@ -12,6 +12,7 @@
 #include <sstream>
 #include <vector>
 
+#include "Util.h"
 #include "stt/SteinerTreeBuilder.h"
 #include "utl/Logger.h"
 
diff --git a/src/cts/src/TreeBuilder.cpp b/src/cts/src/TreeBuilder.cpp
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "Util.h"
 #include "boost/polygon/polygon.hpp"
 #include "odb/db.h"
 #include "odb/geom.h"
diff --git a/src/cts/src/TritonCTS.cpp b/src/cts/src/TritonCTS.cpp
@@ -8,6 +8,7 @@
 #include <cctype>
 #include <cmath>
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <ctime>
 #include <fstream>
diff --git a/src/dft/src/architect/Opt.cpp b/src/dft/src/architect/Opt.cpp
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "ClockDomain.hh"
+#include "ScanCell.hh"
 #include "boost/geometry/geometries/register/point.hpp"
 #include "boost/geometry/geometry.hpp"
 #include "boost/geometry/index/rtree.hpp"
diff --git a/src/dft/src/architect/ScanArchitect.cpp b/src/dft/src/architect/ScanArchitect.cpp
@@ -17,6 +17,7 @@
 #include "ClockDomain.hh"
 #include "ClockDomainHash.hh"
 #include "ScanArchitectHeuristic.hh"
+#include "ScanCell.hh"
 #include "utl/Logger.h"
 
 namespace dft {
diff --git a/src/dft/src/architect/ScanArchitectHeuristic.cpp b/src/dft/src/architect/ScanArchitectHeuristic.cpp
@@ -12,6 +12,7 @@
 #include "ClockDomain.hh"
 #include "Opt.hh"
 #include "ScanArchitect.hh"
+#include "ScanCell.hh"
 #include "utl/Logger.h"
 
 namespace dft {
diff --git a/src/dft/src/architect/ScanChain.cpp b/src/dft/src/architect/ScanChain.cpp
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "ClockDomain.hh"
+#include "ScanCell.hh"
 #include "utl/Logger.h"
 
 namespace dft {
diff --git a/src/dft/src/cells/OneBitScanCell.cpp b/src/dft/src/cells/OneBitScanCell.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "ClockDomain.hh"
+#include "ScanCell.hh"
 #include "db_sta/dbSta.hh"
 #include "odb/db.h"
 #include "odb/geom.h"
diff --git a/src/dft/src/cells/ScanCellFactory.cpp b/src/dft/src/cells/ScanCellFactory.cpp
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "ClockDomain.hh"
+#include "ScanCell.hh"
 #include "Utils.hh"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
diff --git a/src/dft/src/stitch/ScanStitch.cpp b/src/dft/src/stitch/ScanStitch.cpp
@@ -15,6 +15,7 @@
 #include <utility>
 #include <vector>
 
+#include "ScanCell.hh"
 #include "boost/algorithm/string.hpp"
 #include "odb/db.h"
 #include "odb/dbTypes.h"
diff --git a/src/dft/test/cpp/ScanCellMock.cpp b/src/dft/test/cpp/ScanCellMock.cpp
@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "ClockDomain.hh"
+#include "ScanCell.hh"
 #include "odb/db.h"
 #include "odb/geom.h"
 #include "utl/Logger.h"
diff --git a/src/dft/test/cpp/TestScanArchitectHeuristic.cpp b/src/dft/test/cpp/TestScanArchitectHeuristic.cpp
@@ -10,6 +10,7 @@
 #include "ClockDomain.hh"
 #include "ScanArchitect.hh"
 #include "ScanArchitectConfig.hh"
+#include "ScanCell.hh"
 #include "ScanCellMock.hh"
 #include "gtest/gtest.h"
 #include "utl/Logger.h"
diff --git a/src/dpl/include/dpl/Opendp.h b/src/dpl/include/dpl/Opendp.h
@@ -18,6 +18,7 @@
 #include "boost/geometry/core/cs.hpp"
 #include "boost/geometry/geometries/box.hpp"
 #include "boost/geometry/geometries/point_xy.hpp"
+#include "boost/geometry/geometry.hpp"
 #include "boost/geometry/index/rtree.hpp"
 // NOLINTNEXTLINE
 #include "boost/geometry/strategies/strategies.hpp"  // Required implictly by rtree
diff --git a/src/drt/src/GraphicsFactory.cpp b/src/drt/src/GraphicsFactory.cpp
@@ -9,6 +9,7 @@
 #include "frDesign.h"
 #include "global.h"
 #include "odb/db.h"
+#include "pa/FlexPA_graphics.h"
 
 namespace drt {
 
diff --git a/src/drt/src/db/drObj/drPin.cpp b/src/drt/src/db/drObj/drPin.cpp
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "distributed/frArchive.h"
+#include "dr/FlexMazeTypes.h"
 
 namespace drt {
 
diff --git a/src/drt/src/db/drObj/drPin.h b/src/drt/src/db/drObj/drPin.h
@@ -14,6 +14,7 @@
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frInstTerm.h"
 #include "db/obj/frTerm.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 
 namespace drt {
diff --git a/src/drt/src/db/gcObj/gcNet.h b/src/drt/src/db/gcObj/gcNet.h
@@ -10,6 +10,7 @@
 #include "boost/polygon/polygon.hpp"
 #include "db/gcObj/gcBlockObject.h"
 #include "db/gcObj/gcPin.h"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frBlockage.h"
 #include "db/obj/frInstBlockage.h"
diff --git a/src/drt/src/dr/FlexDR.h b/src/drt/src/dr/FlexDR.h
@@ -29,6 +29,7 @@
 #include "db/tech/frViaDef.h"
 #include "dr/AbstractDRGraphics.h"
 #include "dr/FlexGridGraph.h"
+#include "dr/FlexMazeTypes.h"
 #include "dr/FlexWavefront.h"
 #include "drt/TritonRoute.h"
 #include "dst/JobMessage.h"
diff --git a/src/drt/src/dr/FlexDR_conn.cpp b/src/drt/src/dr/FlexDR_conn.cpp
@@ -4,6 +4,7 @@
 #include "dr/FlexDR_conn.h"
 
 #include <algorithm>
+#include <climits>
 #include <cstdlib>
 #include <iostream>
 #include <iterator>
diff --git a/src/drt/src/dr/FlexDR_init.cpp b/src/drt/src/dr/FlexDR_init.cpp
@@ -27,6 +27,7 @@
 #include "db/obj/frVia.h"
 #include "dr/FlexDR.h"
 #include "dr/FlexGridGraph.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "frDesign.h"
 #include "frRTree.h"
diff --git a/src/drt/src/dr/FlexDR_maze.cpp b/src/drt/src/dr/FlexDR_maze.cpp
@@ -31,6 +31,7 @@
 #include "db/obj/frVia.h"
 #include "db/tech/frViaDef.h"
 #include "dr/FlexDR.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "frDesign.h"
 #include "frProfileTask.h"
diff --git a/src/drt/src/dr/FlexGridGraph_maze.cpp b/src/drt/src/dr/FlexGridGraph_maze.cpp
@@ -13,6 +13,7 @@
 
 #include "dr/FlexDR.h"
 #include "dr/FlexGridGraph.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
diff --git a/src/drt/src/gc/FlexGC_cut.cpp b/src/drt/src/gc/FlexGC_cut.cpp
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "boost/polygon/polygon.hpp"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frMarker.h"
 #include "db/obj/frVia.h"
 #include "frBaseTypes.h"
diff --git a/src/drt/src/gc/FlexGC_eol.cpp b/src/drt/src/gc/FlexGC_eol.cpp
@@ -10,6 +10,7 @@
 
 #include "boost/geometry/geometry.hpp"
 #include "boost/polygon/polygon.hpp"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frMarker.h"
 #include "frBaseTypes.h"
 #include "frProfileTask.h"
diff --git a/src/drt/src/gc/FlexGC_impl.h b/src/drt/src/gc/FlexGC_impl.h
@@ -13,6 +13,7 @@
 
 #include "boost/polygon/polygon.hpp"
 #include "db/gcObj/gcNet.h"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frMarker.h"
 #include "db/tech/frLayer.h"
diff --git a/src/drt/src/gc/FlexGC_inf.cpp b/src/drt/src/gc/FlexGC_inf.cpp
@@ -10,6 +10,7 @@
 
 #include "boost/geometry/geometry.hpp"
 #include "boost/polygon/polygon.hpp"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frMarker.h"
 #include "frBaseTypes.h"
 #include "frProfileTask.h"
diff --git a/src/drt/src/gc/FlexGC_init.cpp b/src/drt/src/gc/FlexGC_init.cpp
@@ -11,6 +11,7 @@
 
 #include "boost/polygon/polygon.hpp"
 #include "db/drObj/drNet.h"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frBTerm.h"
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frFig.h"
diff --git a/src/drt/src/gc/FlexGC_main.cpp b/src/drt/src/gc/FlexGC_main.cpp
@@ -14,6 +14,7 @@
 
 #include "boost/geometry/geometry.hpp"
 #include "boost/polygon/polygon.hpp"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frMarker.h"
 #include "frBaseTypes.h"
diff --git a/src/drt/src/gc/FlexGC_metspc.cpp b/src/drt/src/gc/FlexGC_metspc.cpp
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "boost/polygon/polygon.hpp"
+#include "db/gcObj/gcShape.h"
 #include "db/obj/frMarker.h"
 #include "frBaseTypes.h"
 #include "gc/FlexGC_impl.h"
diff --git a/src/drt/src/gc/FlexGC_rq.cpp b/src/drt/src/gc/FlexGC_rq.cpp
@@ -8,6 +8,7 @@
 
 #include "boost/geometry/geometry.hpp"
 #include "boost/polygon/polygon.hpp"
+#include "db/gcObj/gcShape.h"
 #include "frBaseTypes.h"
 #include "frRTree.h"
 #include "gc/FlexGC_impl.h"
diff --git a/src/drt/src/gr/FlexGR.cpp b/src/drt/src/gr/FlexGR.cpp
@@ -4,6 +4,7 @@
 #include "gr/FlexGR.h"
 
 #include <algorithm>
+#include <climits>
 #include <cmath>
 #include <cstddef>
 #include <cstdlib>
diff --git a/src/drt/src/gr/FlexGR.h b/src/drt/src/gr/FlexGR.h
@@ -14,6 +14,7 @@
 #include "db/grObj/grNet.h"
 #include "db/obj/frBlockObject.h"
 #include "db/tech/frTechObject.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "frDesign.h"
 #include "frRTree.h"
diff --git a/src/drt/src/gr/FlexGRCMap.cpp b/src/drt/src/gr/FlexGRCMap.cpp
@@ -4,6 +4,7 @@
 #include "gr/FlexGRCMap.h"
 
 #include <algorithm>
+#include <climits>
 #include <fstream>
 #include <iostream>
 #include <memory>
diff --git a/src/drt/src/gr/FlexGRGridGraph_maze.cpp b/src/drt/src/gr/FlexGRGridGraph_maze.cpp
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <vector>
 
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "gr/FlexGR.h"
 #include "gr/FlexGRGridGraph.h"
diff --git a/src/drt/src/gr/FlexGR_init.cpp b/src/drt/src/gr/FlexGR_init.cpp
@@ -14,6 +14,7 @@
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frVia.h"
 #include "db/tech/frViaDef.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "gr/FlexGR.h"
 #include "gr/FlexGRCMap.h"
diff --git a/src/drt/src/gr/FlexGR_maze.cpp b/src/drt/src/gr/FlexGR_maze.cpp
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "db/obj/frBlockObject.h"
+#include "dr/FlexMazeTypes.h"
 #include "frBaseTypes.h"
 #include "gr/FlexGR.h"
 #include "odb/geom.h"
diff --git a/src/drt/src/gr/FlexGR_topo.cpp b/src/drt/src/gr/FlexGR_topo.cpp
@@ -2,6 +2,7 @@
 // Copyright (c) 2019-2025, The OpenROAD Authors
 
 #include <algorithm>
+#include <climits>
 #include <cmath>
 #include <cstdlib>
 #include <deque>
diff --git a/src/drt/src/pa/FlexPA.cpp b/src/drt/src/pa/FlexPA.cpp
@@ -6,6 +6,7 @@
 #include <cstdint>
 #include <fstream>
 #include <memory>
+#include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/src/drt/src/rp/FlexRP_prep.cpp b/src/drt/src/rp/FlexRP_prep.cpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <climits>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/src/est/BUILD b/src/est/BUILD
@@ -20,7 +20,10 @@ cc_library(
         "src/SteinerRenderer.h",
     ],
     visibility = ["//visibility:private"],
-    deps = ["//src/sta:opensta_lib"],
+    deps = [
+        "//src/grt:groute",
+        "//src/sta:opensta_lib",
+    ],
 )
 
 cc_library(
@@ -45,6 +48,7 @@ cc_library(
         "//src/dbSta:SpefWriter",
         "//src/dbSta:dbNetwork",
         "//src/grt",
+        "//src/grt:groute",
         "//src/odb",
         "//src/sta:opensta_lib",
         "//src/stt",
diff --git a/src/est/include/est/EstimateParasitics.h b/src/est/include/est/EstimateParasitics.h
@@ -16,6 +16,7 @@
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
 #include "est/SteinerTree.h"
+#include "grt/GRoute.h"
 #include "grt/GlobalRouter.h"
 #include "odb/db.h"
 #include "odb/geom.h"
diff --git a/src/est/src/EstimateParasitics.cpp b/src/est/src/EstimateParasitics.cpp
@@ -21,6 +21,7 @@
 #include "db_sta/SpefWriter.hh"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
+#include "grt/GRoute.h"
 #include "grt/GlobalRouter.h"
 #include "odb/db.h"
 #include "odb/dbSet.h"
diff --git a/src/est/src/MakeWireParasitics.cpp b/src/est/src/MakeWireParasitics.cpp
diff --git a/src/est/src/MakeWireParasitics.h b/src/est/src/MakeWireParasitics.h
diff --git a/src/gpl/src/initialPlace.cpp b/src/gpl/src/initialPlace.cpp
diff --git a/src/gpl/src/nesterovBase.cpp b/src/gpl/src/nesterovBase.cpp
diff --git a/src/gpl/src/placerBase.cpp b/src/gpl/src/placerBase.cpp
diff --git a/src/grt/src/GrouteRenderer.cpp b/src/grt/src/GrouteRenderer.cpp
diff --git a/src/grt/src/Net.cpp b/src/grt/src/Net.cpp
diff --git a/src/grt/src/RepairAntennas.cpp b/src/grt/src/RepairAntennas.cpp
diff --git a/src/odb/include/odb/geom.h b/src/odb/include/odb/geom.h
diff --git a/src/par/src/ArtNetSpec.cpp b/src/par/src/ArtNetSpec.cpp
diff --git a/src/rsz/BUILD b/src/rsz/BUILD
diff --git a/src/rsz/src/BufferedNet.cc b/src/rsz/src/BufferedNet.cc
