diff --git a/src/odb/src/db/dbAccessPoint.cpp b/src/odb/src/db/dbAccessPoint.cpp
index adafa176de..bf39252d3a 100644
--- a/src/odb/src/db/dbAccessPoint.cpp
+++ b/src/odb/src/db/dbAccessPoint.cpp
@@ -5,7 +5,9 @@
 #include "dbAccessPoint.h"
 
 #include <array>
+#include <cstdint>
 #include <tuple>
+#include <utility>
 
 #include "dbCore.h"
 #include "dbDatabase.h"
@@ -14,6 +16,7 @@
 #include "odb/db.h"
 #include "odb/dbObject.h"
 #include "odb/dbTypes.h"
+#include "odb/geom.h"
 // User Code Begin Includes
 #include <algorithm>
 #include <vector>
diff --git a/src/odb/src/db/dbBusPort.cpp b/src/odb/src/db/dbBusPort.cpp
index f0ed4aed82..ef8a6c3931 100644
--- a/src/odb/src/db/dbBusPort.cpp
+++ b/src/odb/src/db/dbBusPort.cpp
@@ -5,6 +5,7 @@
 #include "dbBusPort.h"
 
 #include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbModBTerm.h"
@@ -16,6 +17,7 @@
 #include "dbTable.hpp"
 #include "dbVector.h"
 #include "odb/db.h"
+#include "odb/dbSet.h"
 namespace odb {
 template class dbTable<_dbBusPort>;
 
diff --git a/src/odb/src/db/dbBusPort.h b/src/odb/src/db/dbBusPort.h
index c71cfee53c..760983c0f8 100644
--- a/src/odb/src/db/dbBusPort.h
+++ b/src/odb/src/db/dbBusPort.h
@@ -4,6 +4,8 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <cmath>
+
 #include "dbCore.h"
 #include "odb/dbId.h"
 #include "odb/odb.h"
diff --git a/src/odb/src/db/dbCellEdgeSpacing.cpp b/src/odb/src/db/dbCellEdgeSpacing.cpp
index 0b71261aba..5a79a5145c 100644
--- a/src/odb/src/db/dbCellEdgeSpacing.cpp
+++ b/src/odb/src/db/dbCellEdgeSpacing.cpp
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbChip.cpp b/src/odb/src/db/dbChip.cpp
index 7ecb21f793..127b71b429 100644
--- a/src/odb/src/db/dbChip.cpp
+++ b/src/odb/src/db/dbChip.cpp
@@ -4,6 +4,7 @@
 // Generator Code Begin Cpp
 #include "dbChip.h"
 
+#include <cstdlib>
 #include <string>
 #include <unordered_map>
 
@@ -11,6 +12,8 @@
 #include "dbBlockItr.h"
 #include "dbChipConn.h"
 #include "dbChipRegion.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbNameCache.h"
 #include "dbProperty.h"
@@ -19,7 +22,10 @@
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
+#include "odb/dbStream.h"
+#include "odb/geom.h"
 // User Code Begin Includes
 #include "dbChipConnItr.h"
 #include "dbChipInst.h"
diff --git a/src/odb/src/db/dbChip.h b/src/odb/src/db/dbChip.h
index 10e05332c5..39df3e7e15 100644
--- a/src/odb/src/db/dbChip.h
+++ b/src/odb/src/db/dbChip.h
@@ -9,6 +9,7 @@
 
 #include "dbCore.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/geom.h"
 #include "odb/odb.h"
 
diff --git a/src/odb/src/db/dbChipBump.cpp b/src/odb/src/db/dbChipBump.cpp
index 3fd2e798dc..4a8cfbc8bb 100644
--- a/src/odb/src/db/dbChipBump.cpp
+++ b/src/odb/src/db/dbChipBump.cpp
@@ -5,6 +5,7 @@
 #include "dbChipBump.h"
 
 #include "dbChip.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbInst.h"
 #include "dbTable.h"
diff --git a/src/odb/src/db/dbChipBumpInst.cpp b/src/odb/src/db/dbChipBumpInst.cpp
index 5a50bda8fe..b06f671d7a 100644
--- a/src/odb/src/db/dbChipBumpInst.cpp
+++ b/src/odb/src/db/dbChipBumpInst.cpp
@@ -5,6 +5,7 @@
 #include "dbChipBumpInst.h"
 
 #include "dbChip.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbInst.h"
 #include "dbTable.h"
diff --git a/src/odb/src/db/dbChipBumpInstItr.cpp b/src/odb/src/db/dbChipBumpInstItr.cpp
index 755cdbd1e5..02b9a35cf4 100644
--- a/src/odb/src/db/dbChipBumpInstItr.cpp
+++ b/src/odb/src/db/dbChipBumpInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbChipRegionInst.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbChipConn.cpp b/src/odb/src/db/dbChipConn.cpp
index f997e7c211..8767a75edb 100644
--- a/src/odb/src/db/dbChipConn.cpp
+++ b/src/odb/src/db/dbChipConn.cpp
@@ -11,6 +11,7 @@
 #include "dbChipInst.h"
 #include "dbChipRegion.h"
 #include "dbChipRegionInst.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbChipConnItr.cpp b/src/odb/src/db/dbChipConnItr.cpp
index c3e90e0982..ac2f046701 100644
--- a/src/odb/src/db/dbChipConnItr.cpp
+++ b/src/odb/src/db/dbChipConnItr.cpp
@@ -8,6 +8,7 @@
 #include "dbChipConn.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbChipInst.cpp b/src/odb/src/db/dbChipInst.cpp
index 91108d8126..8b5e0ef628 100644
--- a/src/odb/src/db/dbChipInst.cpp
+++ b/src/odb/src/db/dbChipInst.cpp
@@ -7,10 +7,14 @@
 #include <string>
 #include <unordered_map>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbSet.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
 // User Code Begin Includes
 #include "dbChip.h"
 #include "dbChipBumpInst.h"
diff --git a/src/odb/src/db/dbChipInstItr.cpp b/src/odb/src/db/dbChipInstItr.cpp
index 1c5ed423f8..71adeb65c6 100644
--- a/src/odb/src/db/dbChipInstItr.cpp
+++ b/src/odb/src/db/dbChipInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbChipInst.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbChipNet.cpp b/src/odb/src/db/dbChipNet.cpp
index fc007b8054..448ba53eb4 100644
--- a/src/odb/src/db/dbChipNet.cpp
+++ b/src/odb/src/db/dbChipNet.cpp
@@ -12,6 +12,7 @@
 #include "dbChipBumpInst.h"
 #include "dbChipInst.h"
 #include "dbChipRegionInst.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbChipNetItr.cpp b/src/odb/src/db/dbChipNetItr.cpp
index 924b468c0f..9c9c7a4246 100644
--- a/src/odb/src/db/dbChipNetItr.cpp
+++ b/src/odb/src/db/dbChipNetItr.cpp
@@ -8,6 +8,7 @@
 #include "dbChipNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbChipRegion.cpp b/src/odb/src/db/dbChipRegion.cpp
index b9cbbe4517..ccf7fc34a5 100644
--- a/src/odb/src/db/dbChipRegion.cpp
+++ b/src/odb/src/db/dbChipRegion.cpp
@@ -4,14 +4,17 @@
 // Generator Code Begin Cpp
 #include "dbChipRegion.h"
 
+#include <cstdint>
 #include <string>
 
 #include "dbChipBump.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 // User Code Begin Includes
 #include "dbChip.h"
diff --git a/src/odb/src/db/dbChipRegion.h b/src/odb/src/db/dbChipRegion.h
index 5616c7689b..64f1b86be4 100644
--- a/src/odb/src/db/dbChipRegion.h
+++ b/src/odb/src/db/dbChipRegion.h
@@ -4,10 +4,12 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 #include "dbCore.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
 #include "odb/odb.h"
diff --git a/src/odb/src/db/dbChipRegionInst.cpp b/src/odb/src/db/dbChipRegionInst.cpp
index f7847972f5..5bfc53789d 100644
--- a/src/odb/src/db/dbChipRegionInst.cpp
+++ b/src/odb/src/db/dbChipRegionInst.cpp
@@ -5,10 +5,12 @@
 #include "dbChipRegionInst.h"
 
 #include "dbChipRegion.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include "dbChip.h"
 #include "dbChipBumpInst.h"
diff --git a/src/odb/src/db/dbChipRegionInstItr.cpp b/src/odb/src/db/dbChipRegionInstItr.cpp
index 2c679500fb..c155553ecb 100644
--- a/src/odb/src/db/dbChipRegionInstItr.cpp
+++ b/src/odb/src/db/dbChipRegionInstItr.cpp
@@ -9,6 +9,7 @@
 #include "dbChipRegionInst.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbDatabase.cpp b/src/odb/src/db/dbDatabase.cpp
index 44ce85bf98..546ee8eea1 100644
--- a/src/odb/src/db/dbDatabase.cpp
+++ b/src/odb/src/db/dbDatabase.cpp
@@ -10,10 +10,13 @@
 #include "dbChipInst.h"
 #include "dbChipNet.h"
 #include "dbChipRegionInst.h"
+#include "dbCore.h"
 #include "dbProperty.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbDatabaseObserver.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 // User Code Begin Includes
 #include <algorithm>
diff --git a/src/odb/src/db/dbDatabase.h b/src/odb/src/db/dbDatabase.h
index 0009ee33bc..1cb6e912c3 100644
--- a/src/odb/src/db/dbDatabase.h
+++ b/src/odb/src/db/dbDatabase.h
@@ -7,6 +7,7 @@
 #include "dbCore.h"
 #include "dbHashTable.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 // User Code Begin Includes
 #include <iostream>
diff --git a/src/odb/src/db/dbDft.cpp b/src/odb/src/db/dbDft.cpp
index 229306e908..591818e753 100644
--- a/src/odb/src/db/dbDft.cpp
+++ b/src/odb/src/db/dbDft.cpp
@@ -4,12 +4,14 @@
 // Generator Code Begin Cpp
 #include "dbDft.h"
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbScanChain.h"
 #include "dbScanPin.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 namespace odb {
 template class dbTable<_dbDft>;
diff --git a/src/odb/src/db/dbDft.h b/src/odb/src/db/dbDft.h
index 0be341b5dd..63a8985b90 100644
--- a/src/odb/src/db/dbDft.h
+++ b/src/odb/src/db/dbDft.h
@@ -6,6 +6,7 @@
 
 #include "dbBlock.h"
 #include "dbCore.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGCellGrid.cpp b/src/odb/src/db/dbGCellGrid.cpp
index ac33cf6d85..6d92693182 100644
--- a/src/odb/src/db/dbGCellGrid.cpp
+++ b/src/odb/src/db/dbGCellGrid.cpp
@@ -6,14 +6,20 @@
 
 #include <cstdint>
 #include <cstring>
+#include <iterator>
 #include <map>
+#include <utility>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
 #include "odb/db.h"
+#include "odb/dbMatrix.h"
+#include "odb/dbTypes.h"
 // User Code Begin Includes
 #include <algorithm>
 
diff --git a/src/odb/src/db/dbGDSARef.cpp b/src/odb/src/db/dbGDSARef.cpp
index ef0c14b157..248a589438 100644
--- a/src/odb/src/db/dbGDSARef.cpp
+++ b/src/odb/src/db/dbGDSARef.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbGDSARef.h b/src/odb/src/db/dbGDSARef.h
index d26b9b473c..77a628334c 100644
--- a/src/odb/src/db/dbGDSARef.h
+++ b/src/odb/src/db/dbGDSARef.h
@@ -12,6 +12,8 @@
 #include "dbCore.h"
 #include "dbGDSStructure.h"
 #include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGDSBoundary.cpp b/src/odb/src/db/dbGDSBoundary.cpp
index 9eadf7c992..6616482623 100644
--- a/src/odb/src/db/dbGDSBoundary.cpp
+++ b/src/odb/src/db/dbGDSBoundary.cpp
@@ -9,11 +9,14 @@
 #include <utility>
 #include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
+#include "dbGDSStructure.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
 #include "odb/dbTypes.h"
+#include "odb/geom.h"
 namespace odb {
 template class dbTable<_dbGDSBoundary>;
 
diff --git a/src/odb/src/db/dbGDSBoundary.h b/src/odb/src/db/dbGDSBoundary.h
index d2de12537f..17d984c283 100644
--- a/src/odb/src/db/dbGDSBoundary.h
+++ b/src/odb/src/db/dbGDSBoundary.h
@@ -11,6 +11,7 @@
 
 #include "dbCore.h"
 #include "dbGDSStructure.h"
+#include "odb/geom.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGDSBox.cpp b/src/odb/src/db/dbGDSBox.cpp
index 49aabf84d2..82c029e2b5 100644
--- a/src/odb/src/db/dbGDSBox.cpp
+++ b/src/odb/src/db/dbGDSBox.cpp
@@ -9,7 +9,9 @@
 #include <utility>
 #include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
+#include "dbGDSStructure.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
diff --git a/src/odb/src/db/dbGDSBox.h b/src/odb/src/db/dbGDSBox.h
index 456c063664..e5a3454803 100644
--- a/src/odb/src/db/dbGDSBox.h
+++ b/src/odb/src/db/dbGDSBox.h
@@ -11,6 +11,7 @@
 
 #include "dbCore.h"
 #include "dbGDSStructure.h"
+#include "odb/geom.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGDSPath.cpp b/src/odb/src/db/dbGDSPath.cpp
index c4ee714dfb..f539079576 100644
--- a/src/odb/src/db/dbGDSPath.cpp
+++ b/src/odb/src/db/dbGDSPath.cpp
@@ -9,7 +9,9 @@
 #include <utility>
 #include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
+#include "dbGDSStructure.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
diff --git a/src/odb/src/db/dbGDSPath.h b/src/odb/src/db/dbGDSPath.h
index 9a0c0a66ba..e29000342c 100644
--- a/src/odb/src/db/dbGDSPath.h
+++ b/src/odb/src/db/dbGDSPath.h
@@ -11,6 +11,7 @@
 
 #include "dbCore.h"
 #include "dbGDSStructure.h"
+#include "odb/geom.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGDSSRef.cpp b/src/odb/src/db/dbGDSSRef.cpp
index e1c132f8d1..b16434c0ab 100644
--- a/src/odb/src/db/dbGDSSRef.cpp
+++ b/src/odb/src/db/dbGDSSRef.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbGDSSRef.h b/src/odb/src/db/dbGDSSRef.h
index 2262a3120d..44494685fa 100644
--- a/src/odb/src/db/dbGDSSRef.h
+++ b/src/odb/src/db/dbGDSSRef.h
@@ -12,6 +12,8 @@
 #include "dbCore.h"
 #include "dbGDSStructure.h"
 #include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGDSStructure.cpp b/src/odb/src/db/dbGDSStructure.cpp
index b8ad924960..119fd557d2 100644
--- a/src/odb/src/db/dbGDSStructure.cpp
+++ b/src/odb/src/db/dbGDSStructure.cpp
@@ -4,6 +4,10 @@
 // Generator Code Begin Cpp
 #include "dbGDSStructure.h"
 
+#include <cstdlib>
+
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbGDSARef.h"
 #include "dbGDSBoundary.h"
@@ -16,6 +20,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 #include "odb/dbTypes.h"
 namespace odb {
diff --git a/src/odb/src/db/dbGDSStructure.h b/src/odb/src/db/dbGDSStructure.h
index 3386a5f76a..7e54aef971 100644
--- a/src/odb/src/db/dbGDSStructure.h
+++ b/src/odb/src/db/dbGDSStructure.h
@@ -9,6 +9,7 @@
 #include "dbVector.h"
 #include "odb/db.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGDSText.cpp b/src/odb/src/db/dbGDSText.cpp
index 16cdab756b..e5f8d7532c 100644
--- a/src/odb/src/db/dbGDSText.cpp
+++ b/src/odb/src/db/dbGDSText.cpp
@@ -9,7 +9,9 @@
 #include <utility>
 #include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
+#include "dbGDSStructure.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
diff --git a/src/odb/src/db/dbGDSText.h b/src/odb/src/db/dbGDSText.h
index e57c4f87a7..cfc3d06f22 100644
--- a/src/odb/src/db/dbGDSText.h
+++ b/src/odb/src/db/dbGDSText.h
@@ -11,6 +11,8 @@
 
 #include "dbCore.h"
 #include "dbGDSStructure.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbGlobalConnect.cpp b/src/odb/src/db/dbGlobalConnect.cpp
index 997039ae3f..4d0d59e85d 100644
--- a/src/odb/src/db/dbGlobalConnect.cpp
+++ b/src/odb/src/db/dbGlobalConnect.cpp
@@ -4,13 +4,19 @@
 // Generator Code Begin Cpp
 #include "dbGlobalConnect.h"
 
+#include <map>
 #include <regex>
+#include <set>
 #include <string>
+#include <vector>
 
+#include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include "dbInst.h"
 #include "dbLib.h"
diff --git a/src/odb/src/db/dbGroup.cpp b/src/odb/src/db/dbGroup.cpp
index 632b5efd34..356b9290fa 100644
--- a/src/odb/src/db/dbGroup.cpp
+++ b/src/odb/src/db/dbGroup.cpp
@@ -5,10 +5,13 @@
 #include "dbGroup.h"
 
 #include <cstdint>
+#include <cstdlib>
 #include <cstring>
 
 #include "dbBlock.h"
 #include "dbBox.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbGroupInstItr.h"
 #include "dbGroupItr.h"
@@ -19,7 +22,10 @@
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "dbVector.h"
 #include "odb/db.h"
+#include "odb/dbSet.h"
+#include "odb/dbTypes.h"
 // User Code Begin Includes
 #include "dbGroupGroundNetItr.h"
 #include "dbGroupPowerNetItr.h"
diff --git a/src/odb/src/db/dbGroupInstItr.cpp b/src/odb/src/db/dbGroupInstItr.cpp
index 5b0cd4412a..076506cc46 100644
--- a/src/odb/src/db/dbGroupInstItr.cpp
+++ b/src/odb/src/db/dbGroupInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbInst.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbGroupItr.cpp b/src/odb/src/db/dbGroupItr.cpp
index 344acaf1db..bff843d472 100644
--- a/src/odb/src/db/dbGroupItr.cpp
+++ b/src/odb/src/db/dbGroupItr.cpp
@@ -7,6 +7,7 @@
 #include "dbGroup.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 // User Code Begin Includes
 #include "dbModule.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbGroupModInstItr.cpp b/src/odb/src/db/dbGroupModInstItr.cpp
index 51fe8223b8..bfa8b7ed16 100644
--- a/src/odb/src/db/dbGroupModInstItr.cpp
+++ b/src/odb/src/db/dbGroupModInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbModInst.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbGuide.cpp b/src/odb/src/db/dbGuide.cpp
index 9515d610ad..90ab74ec24 100644
--- a/src/odb/src/db/dbGuide.cpp
+++ b/src/odb/src/db/dbGuide.cpp
@@ -4,12 +4,16 @@
 // Generator Code Begin Cpp
 #include "dbGuide.h"
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
+#include "utl/Logger.h"
 // User Code Begin Includes
 #include "dbBlock.h"
 #include "dbJournal.h"
diff --git a/src/odb/src/db/dbGuideItr.cpp b/src/odb/src/db/dbGuideItr.cpp
index a890be5b8e..2720fa6ca2 100644
--- a/src/odb/src/db/dbGuideItr.cpp
+++ b/src/odb/src/db/dbGuideItr.cpp
@@ -7,6 +7,7 @@
 #include "dbGuide.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 // User Code Begin Includes
 #include "dbNet.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbIsolation.cpp b/src/odb/src/db/dbIsolation.cpp
index e6d4118709..506fee163c 100644
--- a/src/odb/src/db/dbIsolation.cpp
+++ b/src/odb/src/db/dbIsolation.cpp
@@ -4,9 +4,13 @@
 // Generator Code Begin Cpp
 #include "dbIsolation.h"
 
+#include <cstdlib>
 #include <string>
+#include <vector>
 
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbMaster.h"
@@ -15,6 +19,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbTypes.h"
 namespace odb {
 template class dbTable<_dbIsolation>;
 
diff --git a/src/odb/src/db/dbLevelShifter.cpp b/src/odb/src/db/dbLevelShifter.cpp
index 6227ce65f2..70e76bec42 100644
--- a/src/odb/src/db/dbLevelShifter.cpp
+++ b/src/odb/src/db/dbLevelShifter.cpp
@@ -4,9 +4,14 @@
 // Generator Code Begin Cpp
 #include "dbLevelShifter.h"
 
+#include <cstdlib>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbMaster.h"
diff --git a/src/odb/src/db/dbLevelShifter.h b/src/odb/src/db/dbLevelShifter.h
index fd74d0cc98..b9c6358038 100644
--- a/src/odb/src/db/dbLevelShifter.h
+++ b/src/odb/src/db/dbLevelShifter.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <string>
+#include <utility>
 
 #include "dbCore.h"
 #include "dbVector.h"
diff --git a/src/odb/src/db/dbLogicPort.cpp b/src/odb/src/db/dbLogicPort.cpp
index 4f6261f018..69614c4323 100644
--- a/src/odb/src/db/dbLogicPort.cpp
+++ b/src/odb/src/db/dbLogicPort.cpp
@@ -4,9 +4,12 @@
 // Generator Code Begin Cpp
 #include "dbLogicPort.h"
 
+#include <cstdlib>
 #include <string>
 
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbIsolation.h"
diff --git a/src/odb/src/db/dbMarker.cpp b/src/odb/src/db/dbMarker.cpp
index 78e5543f43..c2086bc8a5 100644
--- a/src/odb/src/db/dbMarker.cpp
+++ b/src/odb/src/db/dbMarker.cpp
@@ -6,10 +6,16 @@
 
 #include <cstdint>
 #include <cstring>
+#include <fstream>
+#include <iostream>
+#include <set>
 #include <string>
+#include <variant>
+#include <vector>
 
 #include "dbBTerm.h"
 #include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbITerm.h"
 #include "dbInst.h"
@@ -22,6 +28,8 @@
 #include "dbTechLayer.h"
 #include "dbVector.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/geom.h"
 // User Code Begin Includes
 #include "odb/dbBlockCallBackObj.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbMarker.h b/src/odb/src/db/dbMarker.h
index f72dbce5f4..dd31ddc068 100644
--- a/src/odb/src/db/dbMarker.h
+++ b/src/odb/src/db/dbMarker.h
@@ -9,6 +9,7 @@
 #include "dbCore.h"
 #include "dbVector.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 // User Code Begin Includes
 #include <fstream>
diff --git a/src/odb/src/db/dbMarkerCategory.cpp b/src/odb/src/db/dbMarkerCategory.cpp
index 8125c6846c..a8b3009ccd 100644
--- a/src/odb/src/db/dbMarkerCategory.cpp
+++ b/src/odb/src/db/dbMarkerCategory.cpp
@@ -4,14 +4,20 @@
 // Generator Code Begin Cpp
 #include "dbMarkerCategory.h"
 
+#include <cstdlib>
+#include <set>
+#include <stdexcept>
 #include <string>
 
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbMarker.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 // User Code Begin Includes
 #include <fstream>
diff --git a/src/odb/src/db/dbMarkerCategory.h b/src/odb/src/db/dbMarkerCategory.h
index a7eb2fc9b4..2a2a3c1494 100644
--- a/src/odb/src/db/dbMarkerCategory.h
+++ b/src/odb/src/db/dbMarkerCategory.h
@@ -9,6 +9,7 @@
 #include "dbCore.h"
 #include "dbHashTable.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 // User Code Begin Includes
 #include <fstream>
diff --git a/src/odb/src/db/dbMasterEdgeType.cpp b/src/odb/src/db/dbMasterEdgeType.cpp
index f5621b0869..a68d8d4940 100644
--- a/src/odb/src/db/dbMasterEdgeType.cpp
+++ b/src/odb/src/db/dbMasterEdgeType.cpp
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbMaster.h"
 #include "dbTable.h"
diff --git a/src/odb/src/db/dbMetalWidthViaMap.cpp b/src/odb/src/db/dbMetalWidthViaMap.cpp
index 35a0bdc894..e92d1003bb 100644
--- a/src/odb/src/db/dbMetalWidthViaMap.cpp
+++ b/src/odb/src/db/dbMetalWidthViaMap.cpp
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbModBTerm.cpp b/src/odb/src/db/dbModBTerm.cpp
index c909cb3e9b..31db1e88ef 100644
--- a/src/odb/src/db/dbModBTerm.cpp
+++ b/src/odb/src/db/dbModBTerm.cpp
@@ -4,8 +4,12 @@
 // Generator Code Begin Cpp
 #include "dbModBTerm.h"
 
+#include <cstdlib>
+
 #include "dbBlock.h"
 #include "dbBusPort.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbJournal.h"
@@ -15,6 +19,9 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
+#include "utl/Logger.h"
 // User Code Begin Includes
 #include "odb/dbBlockCallBackObj.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbModITerm.cpp b/src/odb/src/db/dbModITerm.cpp
index 9cbe470816..3ed4f02cf5 100644
--- a/src/odb/src/db/dbModITerm.cpp
+++ b/src/odb/src/db/dbModITerm.cpp
@@ -4,7 +4,13 @@
 // Generator Code Begin Cpp
 #include "dbModITerm.h"
 
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbJournal.h"
@@ -14,6 +20,8 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include "odb/dbBlockCallBackObj.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbModInst.cpp b/src/odb/src/db/dbModInst.cpp
index f116354115..0a1d110248 100644
--- a/src/odb/src/db/dbModInst.cpp
+++ b/src/odb/src/db/dbModInst.cpp
@@ -13,6 +13,8 @@
 
 // Generator Code Begin Cpp
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbJournal.h"
@@ -22,6 +24,8 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include "dbGroup.h"
 #include "dbModBTerm.h"
diff --git a/src/odb/src/db/dbModInst.h b/src/odb/src/db/dbModInst.h
index 02c6ecba70..760243c014 100644
--- a/src/odb/src/db/dbModInst.h
+++ b/src/odb/src/db/dbModInst.h
@@ -4,6 +4,9 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <string>
+#include <unordered_map>
+
 #include "dbCore.h"
 #include "dbVector.h"
 #include "odb/dbId.h"
diff --git a/src/odb/src/db/dbModNet.cpp b/src/odb/src/db/dbModNet.cpp
index d669183fac..b75ce32a05 100644
--- a/src/odb/src/db/dbModNet.cpp
+++ b/src/odb/src/db/dbModNet.cpp
@@ -4,7 +4,14 @@
 // Generator Code Begin Cpp
 #include "dbModNet.h"
 
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+#include <string>
+
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbITerm.h"
@@ -17,6 +24,8 @@
 #include "dbTable.hpp"
 #include "dbVector.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include "dbModuleModNetBTermItr.h"
 #include "dbModuleModNetITermItr.h"
diff --git a/src/odb/src/db/dbModule.cpp b/src/odb/src/db/dbModule.cpp
index 52b83d0557..6047c6e9ff 100644
--- a/src/odb/src/db/dbModule.cpp
+++ b/src/odb/src/db/dbModule.cpp
@@ -6,6 +6,7 @@
 
 #include "dbBlock.h"
 #include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbInst.h"
@@ -16,6 +17,8 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include <cstddef>
 #include <cstdlib>
diff --git a/src/odb/src/db/dbModuleBusPortModBTermItr.cpp b/src/odb/src/db/dbModuleBusPortModBTermItr.cpp
index 5acaca9607..d1ab191572 100644
--- a/src/odb/src/db/dbModuleBusPortModBTermItr.cpp
+++ b/src/odb/src/db/dbModuleBusPortModBTermItr.cpp
@@ -4,11 +4,14 @@
 // Generator Code Begin Cpp
 #include "dbModuleBusPortModBTermItr.h"
 
+#include <cmath>
+
 #include "dbBusPort.h"
 #include "dbModBTerm.h"
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleInstItr.cpp b/src/odb/src/db/dbModuleInstItr.cpp
index c44e838ae4..92f7b11615 100644
--- a/src/odb/src/db/dbModuleInstItr.cpp
+++ b/src/odb/src/db/dbModuleInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModBTermItr.cpp b/src/odb/src/db/dbModuleModBTermItr.cpp
index e478f9ced8..f64b44f979 100644
--- a/src/odb/src/db/dbModuleModBTermItr.cpp
+++ b/src/odb/src/db/dbModuleModBTermItr.cpp
@@ -9,6 +9,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModInstItr.cpp b/src/odb/src/db/dbModuleModInstItr.cpp
index 2d755b7058..f177a34e6e 100644
--- a/src/odb/src/db/dbModuleModInstItr.cpp
+++ b/src/odb/src/db/dbModuleModInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModInstModITermItr.cpp b/src/odb/src/db/dbModuleModInstModITermItr.cpp
index 0a36875683..249ee934e0 100644
--- a/src/odb/src/db/dbModuleModInstModITermItr.cpp
+++ b/src/odb/src/db/dbModuleModInstModITermItr.cpp
@@ -9,6 +9,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModNetBTermItr.cpp b/src/odb/src/db/dbModuleModNetBTermItr.cpp
index f9f1611f6c..d5138550d3 100644
--- a/src/odb/src/db/dbModuleModNetBTermItr.cpp
+++ b/src/odb/src/db/dbModuleModNetBTermItr.cpp
@@ -9,6 +9,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModNetITermItr.cpp b/src/odb/src/db/dbModuleModNetITermItr.cpp
index adb892256b..a4ba3b7d73 100644
--- a/src/odb/src/db/dbModuleModNetITermItr.cpp
+++ b/src/odb/src/db/dbModuleModNetITermItr.cpp
@@ -9,6 +9,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModNetItr.cpp b/src/odb/src/db/dbModuleModNetItr.cpp
index dff88d77bc..0869196688 100644
--- a/src/odb/src/db/dbModuleModNetItr.cpp
+++ b/src/odb/src/db/dbModuleModNetItr.cpp
@@ -8,6 +8,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModNetModBTermItr.cpp b/src/odb/src/db/dbModuleModNetModBTermItr.cpp
index 1eb939db94..600a2f3d17 100644
--- a/src/odb/src/db/dbModuleModNetModBTermItr.cpp
+++ b/src/odb/src/db/dbModuleModNetModBTermItr.cpp
@@ -9,6 +9,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModuleModNetModITermItr.cpp b/src/odb/src/db/dbModuleModNetModITermItr.cpp
index ef526fedb5..896e130d20 100644
--- a/src/odb/src/db/dbModuleModNetModITermItr.cpp
+++ b/src/odb/src/db/dbModuleModNetModITermItr.cpp
@@ -9,6 +9,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModulePortItr.cpp b/src/odb/src/db/dbModulePortItr.cpp
index 090c1ff04f..5bca599d4b 100644
--- a/src/odb/src/db/dbModulePortItr.cpp
+++ b/src/odb/src/db/dbModulePortItr.cpp
@@ -10,6 +10,7 @@
 #include "dbModule.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbNetTrack.cpp b/src/odb/src/db/dbNetTrack.cpp
index 327812f881..68d1b49d0c 100644
--- a/src/odb/src/db/dbNetTrack.cpp
+++ b/src/odb/src/db/dbNetTrack.cpp
@@ -4,12 +4,14 @@
 // Generator Code Begin Cpp
 #include "dbNetTrack.h"
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
 #include "odb/db.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include "dbBlock.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbNetTrackItr.cpp b/src/odb/src/db/dbNetTrackItr.cpp
index 836b04c6f2..3dcf5d4e62 100644
--- a/src/odb/src/db/dbNetTrackItr.cpp
+++ b/src/odb/src/db/dbNetTrackItr.cpp
@@ -7,6 +7,7 @@
 #include "dbNetTrack.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 // User Code Begin Includes
 #include "dbNet.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbPolygon.cpp b/src/odb/src/db/dbPolygon.cpp
index 0815890452..511e081fba 100644
--- a/src/odb/src/db/dbPolygon.cpp
+++ b/src/odb/src/db/dbPolygon.cpp
@@ -6,11 +6,16 @@
 
 #include <cstdint>
 #include <cstring>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbSet.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
 // User Code Begin Includes
 #include "dbBoxItr.h"
 #include "dbLib.h"
diff --git a/src/odb/src/db/dbPolygon.h b/src/odb/src/db/dbPolygon.h
index f423e9928b..fecc1af8f1 100644
--- a/src/odb/src/db/dbPolygon.h
+++ b/src/odb/src/db/dbPolygon.h
@@ -4,6 +4,8 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <vector>
+
 #include "dbCore.h"
 #include "odb/dbId.h"
 #include "odb/geom.h"
diff --git a/src/odb/src/db/dbPowerDomain.cpp b/src/odb/src/db/dbPowerDomain.cpp
index a4695f99e5..d6ed3aebfa 100644
--- a/src/odb/src/db/dbPowerDomain.cpp
+++ b/src/odb/src/db/dbPowerDomain.cpp
@@ -5,6 +5,8 @@
 #include "dbPowerDomain.h"
 
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbIsolation.h"
diff --git a/src/odb/src/db/dbPowerDomain.h b/src/odb/src/db/dbPowerDomain.h
index e3120f9d68..ca477e46fa 100644
--- a/src/odb/src/db/dbPowerDomain.h
+++ b/src/odb/src/db/dbPowerDomain.h
@@ -4,6 +4,8 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <string>
+
 #include "dbCore.h"
 #include "dbVector.h"
 #include "odb/dbId.h"
diff --git a/src/odb/src/db/dbPowerSwitch.cpp b/src/odb/src/db/dbPowerSwitch.cpp
index f4c8c087c2..9f722d3b30 100644
--- a/src/odb/src/db/dbPowerSwitch.cpp
+++ b/src/odb/src/db/dbPowerSwitch.cpp
@@ -4,10 +4,14 @@
 // Generator Code Begin Cpp
 #include "dbPowerSwitch.h"
 
+#include <cstdlib>
 #include <map>
 #include <string>
+#include <vector>
 
 #include "dbBlock.h"
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.hpp"
 #include "dbMTerm.h"
@@ -16,6 +20,7 @@
 #include "dbPowerDomain.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "dbVector.h"
 #include "odb/db.h"
 #include "utl/Logger.h"
 namespace odb {
diff --git a/src/odb/src/db/dbProperty.cpp b/src/odb/src/db/dbProperty.cpp
index 1f3063a169..a4056e8eee 100644
--- a/src/odb/src/db/dbProperty.cpp
+++ b/src/odb/src/db/dbProperty.cpp
@@ -4,13 +4,16 @@
 // Generator Code Begin Cpp
 #include "dbProperty.h"
 
+#include <cassert>
 #include <cstdint>
+#include <cstdlib>
 #include <cstring>
 #include <string>
 #include <variant>
 
 #include "dbBlock.h"
 #include "dbChip.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbLib.h"
 #include "dbName.h"
@@ -20,6 +23,8 @@
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
+#include "odb/dbSet.h"
 // User Code Begin Includes
 #include <sstream>
 
diff --git a/src/odb/src/db/dbProperty.h b/src/odb/src/db/dbProperty.h
index 883fcd475a..eee60adda4 100644
--- a/src/odb/src/db/dbProperty.h
+++ b/src/odb/src/db/dbProperty.h
@@ -9,6 +9,7 @@
 
 #include "dbCore.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/dbTypes.h"
 #include "odb/odb.h"
 
diff --git a/src/odb/src/db/dbRegionGroupItr.cpp b/src/odb/src/db/dbRegionGroupItr.cpp
index 52e8e286ac..c868a834fc 100644
--- a/src/odb/src/db/dbRegionGroupItr.cpp
+++ b/src/odb/src/db/dbRegionGroupItr.cpp
@@ -7,6 +7,7 @@
 #include "dbGroup.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 // User Code Begin Includes
 #include "dbRegion.h"
 // User Code End Includes
diff --git a/src/odb/src/db/dbScanChain.cpp b/src/odb/src/db/dbScanChain.cpp
index 9b6aa2792f..2c31ad5f51 100644
--- a/src/odb/src/db/dbScanChain.cpp
+++ b/src/odb/src/db/dbScanChain.cpp
@@ -5,8 +5,11 @@
 #include "dbScanChain.h"
 
 #include <string>
+#include <string_view>
+#include <variant>
 
 #include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbDft.h"
 #include "dbScanInst.h"
@@ -15,6 +18,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 namespace odb {
 template class dbTable<_dbScanChain>;
diff --git a/src/odb/src/db/dbScanChain.h b/src/odb/src/db/dbScanChain.h
index 9ab080284d..72024632fd 100644
--- a/src/odb/src/db/dbScanChain.h
+++ b/src/odb/src/db/dbScanChain.h
@@ -5,11 +5,14 @@
 #pragma once
 
 #include <string>
+#include <variant>
 
 #include "dbCore.h"
 #include "dbScanPin.h"
 #include "dbVector.h"
+#include "odb/db.h"
 #include "odb/dbId.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbScanInst.cpp b/src/odb/src/db/dbScanInst.cpp
index 267080ace5..369a7e66fc 100644
--- a/src/odb/src/db/dbScanInst.cpp
+++ b/src/odb/src/db/dbScanInst.cpp
@@ -5,8 +5,12 @@
 #include "dbScanInst.h"
 
 #include <string>
+#include <string_view>
 #include <utility>
+#include <variant>
 
+#include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbDft.h"
 #include "dbScanChain.h"
diff --git a/src/odb/src/db/dbScanList.cpp b/src/odb/src/db/dbScanList.cpp
index 9b663c5957..ab08e15b71 100644
--- a/src/odb/src/db/dbScanList.cpp
+++ b/src/odb/src/db/dbScanList.cpp
@@ -4,6 +4,8 @@
 // Generator Code Begin Cpp
 #include "dbScanList.h"
 
+#include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbDft.h"
 #include "dbScanChain.h"
@@ -12,6 +14,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbSet.h"
 namespace odb {
 template class dbTable<_dbScanList>;
 
diff --git a/src/odb/src/db/dbScanListScanInstItr.cpp b/src/odb/src/db/dbScanListScanInstItr.cpp
index 6f0bdeda8c..97c986a83d 100644
--- a/src/odb/src/db/dbScanListScanInstItr.cpp
+++ b/src/odb/src/db/dbScanListScanInstItr.cpp
@@ -8,6 +8,7 @@
 #include "dbScanList.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbObject.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbScanPartition.cpp b/src/odb/src/db/dbScanPartition.cpp
index 3972efa1cd..b3ea77c8d6 100644
--- a/src/odb/src/db/dbScanPartition.cpp
+++ b/src/odb/src/db/dbScanPartition.cpp
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbDft.h"
 #include "dbScanChain.h"
@@ -14,6 +15,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
 namespace odb {
 template class dbTable<_dbScanPartition>;
diff --git a/src/odb/src/db/dbScanPartition.h b/src/odb/src/db/dbScanPartition.h
index a6fdb4427c..4699a77ab9 100644
--- a/src/odb/src/db/dbScanPartition.h
+++ b/src/odb/src/db/dbScanPartition.h
@@ -8,6 +8,7 @@
 
 #include "dbCore.h"
 #include "dbScanPin.h"
+#include "odb/dbObject.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbScanPin.cpp b/src/odb/src/db/dbScanPin.cpp
index 7a897c26c0..65e39480bd 100644
--- a/src/odb/src/db/dbScanPin.cpp
+++ b/src/odb/src/db/dbScanPin.cpp
@@ -4,9 +4,11 @@
 // Generator Code Begin Cpp
 #include "dbScanPin.h"
 
+#include <type_traits>
 #include <variant>
 
 #include "dbBlock.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbDft.h"
 #include "dbTable.h"
diff --git a/src/odb/src/db/dbTechLayer.cpp b/src/odb/src/db/dbTechLayer.cpp
index 757a177b8e..2f4e94df13 100644
--- a/src/odb/src/db/dbTechLayer.cpp
+++ b/src/odb/src/db/dbTechLayer.cpp
@@ -4,11 +4,17 @@
 // Generator Code Begin Cpp
 #include "dbTechLayer.h"
 
+#include <algorithm>
 #include <cstdint>
+#include <cstdlib>
 #include <cstring>
+#include <iterator>
+#include <string>
 #include <utility>
 #include <vector>
 
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
@@ -32,8 +38,11 @@
 #include "dbTechLayerTwoWiresForbiddenSpcRule.h"
 #include "dbTechLayerWidthTableRule.h"
 #include "dbTechLayerWrongDirSpacingRule.h"
+#include "dbVector.h"
 #include "odb/db.h"
+#include "odb/dbObject.h"
 #include "odb/dbSet.h"
+#include "odb/dbTypes.h"
 // User Code Begin Includes
 #include "dbHashTable.hpp"
 #include "dbTech.h"
diff --git a/src/odb/src/db/dbTechLayer.h b/src/odb/src/db/dbTechLayer.h
index 62707ca274..e0065e4408 100644
--- a/src/odb/src/db/dbTechLayer.h
+++ b/src/odb/src/db/dbTechLayer.h
@@ -10,7 +10,9 @@
 #include "dbCore.h"
 #include "dbHashTable.h"
 #include "dbVector.h"
+#include "odb/dbId.h"
 #include "odb/dbMatrix.h"
+#include "odb/dbObject.h"
 #include "odb/dbTypes.h"
 #include "odb/odb.h"
 
diff --git a/src/odb/src/db/dbTechLayerAreaRule.cpp b/src/odb/src/db/dbTechLayerAreaRule.cpp
index c719fd15bc..8fd46ec458 100644
--- a/src/odb/src/db/dbTechLayerAreaRule.cpp
+++ b/src/odb/src/db/dbTechLayerAreaRule.cpp
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <utility>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerArraySpacingRule.cpp b/src/odb/src/db/dbTechLayerArraySpacingRule.cpp
index 326d4466a1..0586eb21dc 100644
--- a/src/odb/src/db/dbTechLayerArraySpacingRule.cpp
+++ b/src/odb/src/db/dbTechLayerArraySpacingRule.cpp
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <map>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp b/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp
index e9498d3a69..457d79b3ee 100644
--- a/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp
+++ b/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp
@@ -6,7 +6,10 @@
 
 #include <cstdint>
 #include <cstring>
+#include <utility>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerCornerSpacingRule.h b/src/odb/src/db/dbTechLayerCornerSpacingRule.h
index 65924bb067..ed0e9e3967 100644
--- a/src/odb/src/db/dbTechLayerCornerSpacingRule.h
+++ b/src/odb/src/db/dbTechLayerCornerSpacingRule.h
@@ -4,6 +4,8 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <utility>
+
 #include "dbCore.h"
 #include "odb/odb.h"
 // User Code Begin Includes
diff --git a/src/odb/src/db/dbTechLayerCutClassRule.cpp b/src/odb/src/db/dbTechLayerCutClassRule.cpp
index d3a172e333..d9bf268f4f 100644
--- a/src/odb/src/db/dbTechLayerCutClassRule.cpp
+++ b/src/odb/src/db/dbTechLayerCutClassRule.cpp
@@ -5,8 +5,11 @@
 #include "dbTechLayerCutClassRule.h"
 
 #include <cstdint>
+#include <cstdlib>
 #include <cstring>
 
+#include "dbCommon.h"
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbHashTable.h"
 #include "dbTable.h"
diff --git a/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp b/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp
index d3ba8e231e..29aa4a5e19 100644
--- a/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp
+++ b/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerCutSpacingRule.cpp b/src/odb/src/db/dbTechLayerCutSpacingRule.cpp
index 864b0f1788..95e02c84d3 100644
--- a/src/odb/src/db/dbTechLayerCutSpacingRule.cpp
+++ b/src/odb/src/db/dbTechLayerCutSpacingRule.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp
index 8f63229358..564bac3401 100644
--- a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp
+++ b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp
@@ -4,16 +4,21 @@
 // Generator Code Begin Cpp
 #include "dbTechLayerCutSpacingTableDefRule.h"
 
+#include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <map>
 #include <string>
 #include <tuple>
+#include <utility>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
+#include "dbVector.h"
 #include "odb/db.h"
 // User Code Begin Includes
 #include "dbTech.h"
diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h
index a2c34f7c43..ae3afa3c2b 100644
--- a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h
+++ b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h
@@ -7,6 +7,7 @@
 #include <map>
 #include <string>
 #include <tuple>
+#include <utility>
 
 #include "dbCore.h"
 #include "dbVector.h"
diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp
index 8699cc3e2a..88f01f0dce 100644
--- a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp
+++ b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp
@@ -4,6 +4,10 @@
 // Generator Code Begin Cpp
 #include "dbTechLayerCutSpacingTableOrthRule.h"
 
+#include <utility>
+#include <vector>
+
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h
index 2e3dc49535..181fe5f648 100644
--- a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h
+++ b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h
@@ -4,6 +4,8 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <utility>
+
 #include "dbCore.h"
 #include "dbVector.h"
 #include "odb/odb.h"
diff --git a/src/odb/src/db/dbTechLayerEolExtensionRule.cpp b/src/odb/src/db/dbTechLayerEolExtensionRule.cpp
index 502450d320..60e0676074 100644
--- a/src/odb/src/db/dbTechLayerEolExtensionRule.cpp
+++ b/src/odb/src/db/dbTechLayerEolExtensionRule.cpp
@@ -6,7 +6,10 @@
 
 #include <cstdint>
 #include <cstring>
+#include <utility>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerEolExtensionRule.h b/src/odb/src/db/dbTechLayerEolExtensionRule.h
index 41a931041c..42812f6921 100644
--- a/src/odb/src/db/dbTechLayerEolExtensionRule.h
+++ b/src/odb/src/db/dbTechLayerEolExtensionRule.h
@@ -4,6 +4,8 @@
 // Generator Code Begin Header
 #pragma once
 
+#include <utility>
+
 #include "dbCore.h"
 #include "dbVector.h"
 #include "odb/odb.h"
diff --git a/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp b/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp
index c72fc287fb..6ba3b907cb 100644
--- a/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp
+++ b/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp b/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp
index 61dca1d6e7..58c5fc1325 100644
--- a/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp
+++ b/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp b/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp
index 73055725f6..e90882aa09 100644
--- a/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp
+++ b/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerMaxSpacingRule.cpp b/src/odb/src/db/dbTechLayerMaxSpacingRule.cpp
index d27cbf326c..c1914300ff 100644
--- a/src/odb/src/db/dbTechLayerMaxSpacingRule.cpp
+++ b/src/odb/src/db/dbTechLayerMaxSpacingRule.cpp
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerMinCutRule.cpp b/src/odb/src/db/dbTechLayerMinCutRule.cpp
index 899479e83f..866da798e5 100644
--- a/src/odb/src/db/dbTechLayerMinCutRule.cpp
+++ b/src/odb/src/db/dbTechLayerMinCutRule.cpp
@@ -9,6 +9,7 @@
 #include <map>
 #include <string>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerMinStepRule.cpp b/src/odb/src/db/dbTechLayerMinStepRule.cpp
index b3dbaeb7f3..34909e1849 100644
--- a/src/odb/src/db/dbTechLayerMinStepRule.cpp
+++ b/src/odb/src/db/dbTechLayerMinStepRule.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerSpacingEolRule.cpp b/src/odb/src/db/dbTechLayerSpacingEolRule.cpp
index 452648b5b5..0a9fe22394 100644
--- a/src/odb/src/db/dbTechLayerSpacingEolRule.cpp
+++ b/src/odb/src/db/dbTechLayerSpacingEolRule.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerSpacingEolRule.h b/src/odb/src/db/dbTechLayerSpacingEolRule.h
index ced3e76b55..68e4caf792 100644
--- a/src/odb/src/db/dbTechLayerSpacingEolRule.h
+++ b/src/odb/src/db/dbTechLayerSpacingEolRule.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include "dbCore.h"
+#include "odb/dbId.h"
 #include "odb/odb.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp b/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp
index f102e87fe9..2f4ba0fa95 100644
--- a/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp
+++ b/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp
@@ -4,14 +4,21 @@
 // Generator Code Begin Cpp
 #include "dbTechLayerSpacingTablePrlRule.h"
 
+#include <algorithm>
 #include <cstdint>
 #include <cstring>
+#include <iterator>
+#include <map>
 #include <tuple>
+#include <utility>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
+#include "dbVector.h"
 #include "odb/db.h"
 namespace odb {
 template class dbTable<_dbTechLayerSpacingTablePrlRule>;
diff --git a/src/odb/src/db/dbTechLayerTwoWiresForbiddenSpcRule.cpp b/src/odb/src/db/dbTechLayerTwoWiresForbiddenSpcRule.cpp
index 9dfcbcfbc8..127a551f42 100644
--- a/src/odb/src/db/dbTechLayerTwoWiresForbiddenSpcRule.cpp
+++ b/src/odb/src/db/dbTechLayerTwoWiresForbiddenSpcRule.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerWidthTableRule.cpp b/src/odb/src/db/dbTechLayerWidthTableRule.cpp
index 36cc82f057..3a76d8f0b0 100644
--- a/src/odb/src/db/dbTechLayerWidthTableRule.cpp
+++ b/src/odb/src/db/dbTechLayerWidthTableRule.cpp
@@ -6,7 +6,9 @@
 
 #include <cstdint>
 #include <cstring>
+#include <vector>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerWrongDirSpacingRule.cpp b/src/odb/src/db/dbTechLayerWrongDirSpacingRule.cpp
index bfd2537586..41bf935945 100644
--- a/src/odb/src/db/dbTechLayerWrongDirSpacingRule.cpp
+++ b/src/odb/src/db/dbTechLayerWrongDirSpacingRule.cpp
@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "dbCore.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
diff --git a/src/odb/src/db/dbTechLayerWrongDirSpacingRule.h b/src/odb/src/db/dbTechLayerWrongDirSpacingRule.h
index b9c265cb2b..0e77a41e32 100644
--- a/src/odb/src/db/dbTechLayerWrongDirSpacingRule.h
+++ b/src/odb/src/db/dbTechLayerWrongDirSpacingRule.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include "dbCore.h"
+#include "odb/dbId.h"
 #include "odb/odb.h"
 
 namespace odb {