diff --git a/src/odb/src/db/dbBPin.cpp b/src/odb/src/db/dbBPin.cpp
index c3d588de31f..9dc1df0c84f 100644
--- a/src/odb/src/db/dbBPin.cpp
+++ b/src/odb/src/db/dbBPin.cpp
@@ -34,16 +34,17 @@
 
 #include <iostream>
 
-#include "db.h"
 #include "dbAccessPoint.h"
 #include "dbBTerm.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbBoxItr.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+
 namespace odb {
 
 template class dbTable<_dbBPin>;
diff --git a/src/odb/src/db/dbBlockage.cpp b/src/odb/src/db/dbBlockage.cpp
index b2681d982ed..3b097a35a19 100644
--- a/src/odb/src/db/dbBlockage.cpp
+++ b/src/odb/src/db/dbBlockage.cpp
@@ -32,17 +32,17 @@
 
 #include "dbBlockage.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbDatabase.h"
-#include "dbDiff.h"
 #include "dbDiff.hpp"
 #include "dbInst.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbDiff.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbCCSeg.cpp b/src/odb/src/db/dbCCSeg.cpp
index c9fe3cd58b5..b8cb94953c5 100644
--- a/src/odb/src/db/dbCCSeg.cpp
+++ b/src/odb/src/db/dbCCSeg.cpp
@@ -32,7 +32,6 @@
 
 #include "dbCCSeg.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbCapNode.h"
 #include "dbDatabase.h"
@@ -40,6 +39,7 @@
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbCapNode.cpp b/src/odb/src/db/dbCapNode.cpp
index cc8696e269e..6f64eae568a 100644
--- a/src/odb/src/db/dbCapNode.cpp
+++ b/src/odb/src/db/dbCapNode.cpp
@@ -32,7 +32,6 @@
 
 #include "dbCapNode.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbCCSeg.h"
 #include "dbCCSegItr.h"
@@ -42,6 +41,7 @@
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbFill.cpp b/src/odb/src/db/dbFill.cpp
index 82405497a68..84990855040 100644
--- a/src/odb/src/db/dbFill.cpp
+++ b/src/odb/src/db/dbFill.cpp
@@ -32,15 +32,15 @@
 
 #include "dbFill.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbGCellGrid.cpp b/src/odb/src/db/dbGCellGrid.cpp
index e777275efad..c3bdf78c2d3 100644
--- a/src/odb/src/db/dbGCellGrid.cpp
+++ b/src/odb/src/db/dbGCellGrid.cpp
@@ -47,8 +47,8 @@
 #include <algorithm>
 
 #include "dbBlock.h"
-#include "dbSet.h"
 #include "dbTech.h"
+#include "odb/dbSet.h"
 // User Code End Includes
 namespace odb {
 template class dbTable<_dbGCellGrid>;
diff --git a/src/odb/src/db/dbGCellGrid.h b/src/odb/src/db/dbGCellGrid.h
index e8c2ee3290b..6930c099ef8 100644
--- a/src/odb/src/db/dbGCellGrid.h
+++ b/src/odb/src/db/dbGCellGrid.h
@@ -39,8 +39,8 @@
 // User Code Begin Includes
 #include <map>
 
-#include "dbMatrix.h"
 #include "dbVector.h"
+#include "odb/dbMatrix.h"
 // User Code End Includes
 
 namespace odb {
diff --git a/src/odb/src/db/dbGroupGroundNetItr.h b/src/odb/src/db/dbGroupGroundNetItr.h
index ea84e270428..40151327c4a 100644
--- a/src/odb/src/db/dbGroupGroundNetItr.h
+++ b/src/odb/src/db/dbGroupGroundNetItr.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "dbIterator.h"
-#include "odb.h"
+#include "odb/dbIterator.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbGroupPowerNetItr.h b/src/odb/src/db/dbGroupPowerNetItr.h
index 9509571eeaf..c6d1bfbe1c0 100644
--- a/src/odb/src/db/dbGroupPowerNetItr.h
+++ b/src/odb/src/db/dbGroupPowerNetItr.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "dbIterator.h"
-#include "odb.h"
+#include "odb/dbIterator.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbHier.cpp b/src/odb/src/db/dbHier.cpp
index eef4f689502..675f0e16d91 100644
--- a/src/odb/src/db/dbHier.cpp
+++ b/src/odb/src/db/dbHier.cpp
@@ -32,7 +32,6 @@
 
 #include "dbHier.h"
 
-#include "db.h"
 #include "dbBTerm.h"
 #include "dbBlock.h"
 #include "dbChip.h"
@@ -42,6 +41,7 @@
 #include "dbMaster.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbJournal.cpp b/src/odb/src/db/dbJournal.cpp
index 35cb1a3e49a..a2956bcaac3 100644
--- a/src/odb/src/db/dbJournal.cpp
+++ b/src/odb/src/db/dbJournal.cpp
@@ -32,7 +32,6 @@
 
 #include "dbJournal.h"
 
-#include "db.h"
 #include "dbBTerm.h"
 #include "dbBlock.h"
 #include "dbCCSeg.h"
@@ -41,6 +40,7 @@
 #include "dbInst.h"
 #include "dbNet.h"
 #include "dbRSeg.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbMetalWidthViaMap.h b/src/odb/src/db/dbMetalWidthViaMap.h
index 702047f80a3..2a080aef7d7 100644
--- a/src/odb/src/db/dbMetalWidthViaMap.h
+++ b/src/odb/src/db/dbMetalWidthViaMap.h
@@ -37,8 +37,8 @@
 #include "odb/odb.h"
 
 // User Code Begin Includes
-#include "db.h"
 #include "dbVector.h"
+#include "odb/db.h"
 // User Code End Includes
 
 namespace odb {
@@ -79,4 +79,4 @@ class _dbMetalWidthViaMap : public _dbObject
 dbIStream& operator>>(dbIStream& stream, _dbMetalWidthViaMap& obj);
 dbOStream& operator<<(dbOStream& stream, const _dbMetalWidthViaMap& obj);
 }  // namespace odb
-   // Generator Code End Header
\ No newline at end of file
+   // Generator Code End Header
diff --git a/src/odb/src/db/dbName.h b/src/odb/src/db/dbName.h
index 43048f26159..125dff6f508 100644
--- a/src/odb/src/db/dbName.h
+++ b/src/odb/src/db/dbName.h
@@ -33,8 +33,8 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbNameCache.cpp b/src/odb/src/db/dbNameCache.cpp
index 7009d6672f9..70e7892bb73 100644
--- a/src/odb/src/db/dbNameCache.cpp
+++ b/src/odb/src/db/dbNameCache.cpp
@@ -33,13 +33,13 @@
 #include "dbNameCache.h"
 
 #include "dbDatabase.h"
-#include "dbDiff.h"
 #include "dbDiff.hpp"
 #include "dbHashTable.hpp"
 #include "dbName.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbDiff.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbObstruction.cpp b/src/odb/src/db/dbObstruction.cpp
index 4ee2d89d62b..6477773bdfc 100644
--- a/src/odb/src/db/dbObstruction.cpp
+++ b/src/odb/src/db/dbObstruction.cpp
@@ -32,17 +32,17 @@
 
 #include "dbObstruction.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
 #include "dbInst.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbProperty.cpp b/src/odb/src/db/dbProperty.cpp
index 8a2c3af8024..142f123057a 100644
--- a/src/odb/src/db/dbProperty.cpp
+++ b/src/odb/src/db/dbProperty.cpp
@@ -36,7 +36,6 @@
 
 #include <sstream>
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbChip.h"
 #include "dbDatabase.h"
@@ -47,6 +46,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbRSeg.cpp b/src/odb/src/db/dbRSeg.cpp
index 599acbbfb99..5d410224ce8 100644
--- a/src/odb/src/db/dbRSeg.cpp
+++ b/src/odb/src/db/dbRSeg.cpp
@@ -32,16 +32,16 @@
 
 #include "dbRSeg.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbCapNode.h"
 #include "dbCommon.h"
 #include "dbDatabase.h"
 #include "dbJournal.h"
 #include "dbNet.h"
-#include "dbShape.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbRegion.cpp b/src/odb/src/db/dbRegion.cpp
index 13ebf0e9b43..7058dd3f46c 100644
--- a/src/odb/src/db/dbRegion.cpp
+++ b/src/odb/src/db/dbRegion.cpp
@@ -32,9 +32,7 @@
 
 #include "dbRegion.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbBoxItr.h"
 #include "dbDatabase.h"
@@ -44,6 +42,8 @@
 #include "dbRegionInstItr.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbRow.cpp b/src/odb/src/db/dbRow.cpp
index e8bf5670598..97c18785efe 100644
--- a/src/odb/src/db/dbRow.cpp
+++ b/src/odb/src/db/dbRow.cpp
@@ -32,17 +32,17 @@
 
 #include "dbRow.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
 #include "dbLib.h"
-#include "dbSet.h"
 #include "dbSite.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
-#include "dbTransform.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbSet.h"
+#include "odb/dbTransform.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbRow.h b/src/odb/src/db/dbRow.h
index b372f0490c3..6f416ab4d40 100644
--- a/src/odb/src/db/dbRow.h
+++ b/src/odb/src/db/dbRow.h
@@ -33,9 +33,9 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbSWire.cpp b/src/odb/src/db/dbSWire.cpp
index bcdcf4676f2..8b5ee6290f5 100644
--- a/src/odb/src/db/dbSWire.cpp
+++ b/src/odb/src/db/dbSWire.cpp
@@ -32,16 +32,16 @@
 
 #include "dbSWire.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbDiff.hpp"
 #include "dbNet.h"
 #include "dbSBox.h"
 #include "dbSBoxItr.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbSite.cpp b/src/odb/src/db/dbSite.cpp
index c131064910e..23298db09d4 100644
--- a/src/odb/src/db/dbSite.cpp
+++ b/src/odb/src/db/dbSite.cpp
@@ -32,11 +32,11 @@
 
 #include "dbSite.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbLib.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTarget.cpp b/src/odb/src/db/dbTarget.cpp
index 84552bf703c..bc2da852d7e 100644
--- a/src/odb/src/db/dbTarget.cpp
+++ b/src/odb/src/db/dbTarget.cpp
@@ -32,7 +32,6 @@
 
 #include "dbTarget.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbLib.h"
 #include "dbMTerm.h"
@@ -41,6 +40,7 @@
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTarget.h b/src/odb/src/db/dbTarget.h
index bc851366198..958b3826856 100644
--- a/src/odb/src/db/dbTarget.h
+++ b/src/odb/src/db/dbTarget.h
@@ -33,9 +33,9 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "geom.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechLayer.cpp b/src/odb/src/db/dbTechLayer.cpp
index 846b692050f..051f69f5c9d 100644
--- a/src/odb/src/db/dbTechLayer.cpp
+++ b/src/odb/src/db/dbTechLayer.cpp
@@ -69,7 +69,7 @@
 #include "dbTechLayerAntennaRule.h"
 #include "dbTechLayerSpacingRule.h"
 #include "dbTechMinCutOrAreaRule.h"
-#include "lefout.h"
+#include "odb/lefout.h"
 #include "utl/Logger.h"
 // User Code End Includes
 namespace odb {
diff --git a/src/odb/src/db/dbTechLayerAntennaRule.cpp b/src/odb/src/db/dbTechLayerAntennaRule.cpp
index 01ef7ed5f99..9eedf6c8c79 100644
--- a/src/odb/src/db/dbTechLayerAntennaRule.cpp
+++ b/src/odb/src/db/dbTechLayerAntennaRule.cpp
@@ -34,14 +34,14 @@
 
 #include <spdlog/fmt/ostr.h>
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbMaster.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
-#include "lefout.h"
+#include "odb/db.h"
+#include "odb/lefout.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechLayerRule.cpp b/src/odb/src/db/dbTechLayerRule.cpp
index 32458f16d2a..084e8746096 100644
--- a/src/odb/src/db/dbTechLayerRule.cpp
+++ b/src/odb/src/db/dbTechLayerRule.cpp
@@ -32,7 +32,6 @@
 
 #include "dbTechLayerRule.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
@@ -40,6 +39,7 @@
 #include "dbTech.h"
 #include "dbTechLayer.h"
 #include "dbTechNonDefaultRule.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechLayerRule.h b/src/odb/src/db/dbTechLayerRule.h
index 2997ddd6b0f..9373baefe78 100644
--- a/src/odb/src/db/dbTechLayerRule.h
+++ b/src/odb/src/db/dbTechLayerRule.h
@@ -33,9 +33,9 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechMinCutOrAreaRule.cpp b/src/odb/src/db/dbTechMinCutOrAreaRule.cpp
index 0a6be39e09e..2b7fbec7390 100644
--- a/src/odb/src/db/dbTechMinCutOrAreaRule.cpp
+++ b/src/odb/src/db/dbTechMinCutOrAreaRule.cpp
@@ -32,13 +32,13 @@
 
 #include "dbTechMinCutOrAreaRule.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
-#include "lefout.h"
+#include "odb/db.h"
+#include "odb/lefout.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechNonDefaultRule.cpp b/src/odb/src/db/dbTechNonDefaultRule.cpp
index a112d3cc55d..17e8a0b4445 100644
--- a/src/odb/src/db/dbTechNonDefaultRule.cpp
+++ b/src/odb/src/db/dbTechNonDefaultRule.cpp
@@ -32,7 +32,6 @@
 
 #include "dbTechNonDefaultRule.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
@@ -42,6 +41,7 @@
 #include "dbTechLayerRule.h"
 #include "dbTechSameNetRule.h"
 #include "dbTechVia.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechNonDefaultRule.h b/src/odb/src/db/dbTechNonDefaultRule.h
index aa5976c6392..2e4fcbef02d 100644
--- a/src/odb/src/db/dbTechNonDefaultRule.h
+++ b/src/odb/src/db/dbTechNonDefaultRule.h
@@ -33,11 +33,11 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbMatrix.h"
-#include "dbTypes.h"
 #include "dbVector.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbMatrix.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechSameNetRule.cpp b/src/odb/src/db/dbTechSameNetRule.cpp
index 6ad7e19fcff..92a7cad765a 100644
--- a/src/odb/src/db/dbTechSameNetRule.cpp
+++ b/src/odb/src/db/dbTechSameNetRule.cpp
@@ -32,13 +32,13 @@
 
 #include "dbTechSameNetRule.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
 #include "dbTechNonDefaultRule.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechSameNetRule.h b/src/odb/src/db/dbTechSameNetRule.h
index 401a794dd73..a1545cb041b 100644
--- a/src/odb/src/db/dbTechSameNetRule.h
+++ b/src/odb/src/db/dbTechSameNetRule.h
@@ -33,9 +33,9 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechVia.cpp b/src/odb/src/db/dbTechVia.cpp
index 6a3165079dc..bbc9ffa2428 100644
--- a/src/odb/src/db/dbTechVia.cpp
+++ b/src/odb/src/db/dbTechVia.cpp
@@ -32,7 +32,6 @@
 
 #include "dbTechVia.h"
 
-#include "db.h"
 #include "dbBox.h"
 #include "dbBoxItr.h"
 #include "dbDatabase.h"
@@ -42,7 +41,8 @@
 #include "dbTechLayer.h"
 #include "dbTechNonDefaultRule.h"
 #include "dbTechViaGenerateRule.h"
-#include "dbViaParams.h"
+#include "odb/db.h"
+#include "odb/dbViaParams.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechViaGenerateRule.cpp b/src/odb/src/db/dbTechViaGenerateRule.cpp
index 44786cadba6..958f5da1614 100644
--- a/src/odb/src/db/dbTechViaGenerateRule.cpp
+++ b/src/odb/src/db/dbTechViaGenerateRule.cpp
@@ -32,15 +32,15 @@
 
 #include "dbTechViaGenerateRule.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
 #include "dbTechVia.h"
+#include "odb/db.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechViaGenerateRule.h b/src/odb/src/db/dbTechViaGenerateRule.h
index 3bad5fb8e40..62415fe497d 100644
--- a/src/odb/src/db/dbTechViaGenerateRule.h
+++ b/src/odb/src/db/dbTechViaGenerateRule.h
@@ -33,11 +33,11 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
 #include "dbVector.h"
-#include "geom.h"
-#include "odb.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/dbTechViaLayerRule.cpp b/src/odb/src/db/dbTechViaLayerRule.cpp
index 2150e2690d8..fce62ef1798 100644
--- a/src/odb/src/db/dbTechViaLayerRule.cpp
+++ b/src/odb/src/db/dbTechViaLayerRule.cpp
@@ -32,10 +32,8 @@
 
 #include "dbTechViaLayerRule.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
@@ -43,6 +41,8 @@
 #include "dbTechVia.h"
 #include "dbTechViaGenerateRule.h"
 #include "dbTechViaRule.h"
+#include "odb/db.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechViaLayerRule.h b/src/odb/src/db/dbTechViaLayerRule.h
index a68b30982c9..b8a3df761f1 100644
--- a/src/odb/src/db/dbTechViaLayerRule.h
+++ b/src/odb/src/db/dbTechViaLayerRule.h
@@ -33,10 +33,10 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
-#include "geom.h"
-#include "odb.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/dbTechViaRule.cpp b/src/odb/src/db/dbTechViaRule.cpp
index 33a3bbd7272..5748f67edea 100644
--- a/src/odb/src/db/dbTechViaRule.cpp
+++ b/src/odb/src/db/dbTechViaRule.cpp
@@ -32,15 +32,15 @@
 
 #include "dbTechViaRule.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
 #include "dbTechVia.h"
+#include "odb/db.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTechViaRule.h b/src/odb/src/db/dbTechViaRule.h
index 3d32fdfb22f..0e3b14876dc 100644
--- a/src/odb/src/db/dbTechViaRule.h
+++ b/src/odb/src/db/dbTechViaRule.h
@@ -33,11 +33,11 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
 #include "dbVector.h"
-#include "geom.h"
-#include "odb.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/dbTrackGrid.cpp b/src/odb/src/db/dbTrackGrid.cpp
index 5340aa407d4..b5a1075a5f1 100644
--- a/src/odb/src/db/dbTrackGrid.cpp
+++ b/src/odb/src/db/dbTrackGrid.cpp
@@ -34,16 +34,16 @@
 
 #include <algorithm>
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbChip.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
+#include "odb/db.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbTrackGrid.h b/src/odb/src/db/dbTrackGrid.h
index ffcaf81c02b..d9ce36dc964 100644
--- a/src/odb/src/db/dbTrackGrid.h
+++ b/src/odb/src/db/dbTrackGrid.h
@@ -33,10 +33,10 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
 #include "dbVector.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbUtil.cpp b/src/odb/src/db/dbUtil.cpp
index 3a026d4d000..3e3899ce9ea 100644
--- a/src/odb/src/db/dbUtil.cpp
+++ b/src/odb/src/db/dbUtil.cpp
@@ -30,13 +30,13 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "dbUtil.h"
+#include "odb/dbUtil.h"
 
-#include "array1.h"
-#include "db.h"
-#include "dbShape.h"
 #include "dbTechLayerRule.h"
-#include "dbWireCodec.h"
+#include "odb/array1.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbWireCodec.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/dbVia.cpp b/src/odb/src/db/dbVia.cpp
index bfc894cc90c..fb576d611fb 100644
--- a/src/odb/src/db/dbVia.cpp
+++ b/src/odb/src/db/dbVia.cpp
@@ -32,20 +32,20 @@
 
 #include "dbVia.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbBox.h"
 #include "dbBoxItr.h"
 #include "dbChip.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
 #include "dbTechVia.h"
 #include "dbTechViaGenerateRule.h"
+#include "odb/db.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbWire.cpp b/src/odb/src/db/dbWire.cpp
index 39180e7fd8b..1454094ad00 100644
--- a/src/odb/src/db/dbWire.cpp
+++ b/src/odb/src/db/dbWire.cpp
@@ -34,16 +34,16 @@
 
 #include <algorithm>
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbNet.h"
-#include "dbShape.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayerRule.h"
 #include "dbVia.h"
 #include "dbWireOpcode.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/db/dbWire.h b/src/odb/src/db/dbWire.h
index d18f65abdcd..fe96a068a28 100644
--- a/src/odb/src/db/dbWire.h
+++ b/src/odb/src/db/dbWire.h
@@ -33,10 +33,10 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
 #include "dbVector.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbWireGraph.cpp b/src/odb/src/db/dbWireGraph.cpp
index e88ea6f18a8..a00a97994e5 100644
--- a/src/odb/src/db/dbWireGraph.cpp
+++ b/src/odb/src/db/dbWireGraph.cpp
@@ -33,8 +33,8 @@
 #include "odb/dbWireGraph.h"
 
 #include "dbWire.h"
-#include "dbWireCodec.h"
 #include "odb/db.h"
+#include "odb/dbWireCodec.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbWireOpcode.h b/src/odb/src/db/dbWireOpcode.h
index 483b661cbe5..34e1f860bad 100644
--- a/src/odb/src/db/dbWireOpcode.h
+++ b/src/odb/src/db/dbWireOpcode.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "db.h"
-#include "odb.h"
+#include "odb/db.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbWirePathItr.cpp b/src/odb/src/db/dbWirePathItr.cpp
index 7a8e4257fa9..4ac9e09e858 100644
--- a/src/odb/src/db/dbWirePathItr.cpp
+++ b/src/odb/src/db/dbWirePathItr.cpp
@@ -35,10 +35,10 @@
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbWire.h"
-#include "dbWireCodec.h"
 #include "dbWireOpcode.h"
 #include "odb/db.h"
 #include "odb/dbShape.h"
+#include "odb/dbWireCodec.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/grids.cpp b/src/odb/src/db/grids.cpp
index 4331e0c6d50..ab44b997307 100644
--- a/src/odb/src/db/grids.cpp
+++ b/src/odb/src/db/grids.cpp
@@ -32,7 +32,7 @@
 
 #include <cstdio>
 
-#include "wire.h"
+#include "odb/wire.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/gs.cpp b/src/odb/src/db/gs.cpp
index 35487c5f115..744c5ab0b22 100644
--- a/src/odb/src/db/gs.cpp
+++ b/src/odb/src/db/gs.cpp
@@ -33,7 +33,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "gseq.h"
+#include "odb/gseq.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/tmg_conn.cpp b/src/odb/src/db/tmg_conn.cpp
index a7f28af24bc..33f29f9aa11 100644
--- a/src/odb/src/db/tmg_conn.cpp
+++ b/src/odb/src/db/tmg_conn.cpp
@@ -35,9 +35,9 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "db.h"
-#include "dbShape.h"
-#include "dbWireCodec.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbWireCodec.h"
 #include "utl/Logger.h"
 
 namespace odb {
diff --git a/src/odb/src/db/tmg_conn.h b/src/odb/src/db/tmg_conn.h
index ff6a922b058..9794d836bf8 100644
--- a/src/odb/src/db/tmg_conn.h
+++ b/src/odb/src/db/tmg_conn.h
@@ -36,9 +36,9 @@
 #include <memory>
 #include <vector>
 
-#include "db.h"
-#include "dbWireCodec.h"
-#include "geom.h"
+#include "odb/db.h"
+#include "odb/dbWireCodec.h"
+#include "odb/geom.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/tmg_conn_g.cpp b/src/odb/src/db/tmg_conn_g.cpp
index 6eac0b0e4b7..8944e65a983 100644
--- a/src/odb/src/db/tmg_conn_g.cpp
+++ b/src/odb/src/db/tmg_conn_g.cpp
@@ -33,9 +33,9 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "db.h"
-#include "dbShape.h"
-#include "dbWireCodec.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbWireCodec.h"
 #include "tmg_conn.h"
 #include "utl/Logger.h"
 
diff --git a/src/odb/src/db/tmg_conn_s.cpp b/src/odb/src/db/tmg_conn_s.cpp
index a7b5ac5cb44..2cabbf89122 100644
--- a/src/odb/src/db/tmg_conn_s.cpp
+++ b/src/odb/src/db/tmg_conn_s.cpp
@@ -30,7 +30,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "db.h"
+#include "odb/db.h"
 #include "tmg_conn.h"
 
 namespace odb {
diff --git a/src/odb/src/db/tmg_conn_w.cpp b/src/odb/src/db/tmg_conn_w.cpp
index d8b407f31ed..eeb4b9205f5 100644
--- a/src/odb/src/db/tmg_conn_w.cpp
+++ b/src/odb/src/db/tmg_conn_w.cpp
@@ -34,9 +34,9 @@
 #include <cstdlib>
 #include <unordered_set>
 
-#include "db.h"
-#include "dbShape.h"
-#include "dbWireCodec.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbWireCodec.h"
 #include "tmg_conn.h"
 #include "utl/Logger.h"
 
diff --git a/src/odb/src/db/wOrder.cpp b/src/odb/src/db/wOrder.cpp
index 8bd4e066ff6..6fcf0bba91d 100644
--- a/src/odb/src/db/wOrder.cpp
+++ b/src/odb/src/db/wOrder.cpp
@@ -30,9 +30,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "wOrder.h"
+#include "odb/wOrder.h"
 
-#include "db.h"
+#include "odb/db.h"
 #include "tmg_conn.h"
 
 namespace odb {
diff --git a/src/odb/src/defin/create_box.h b/src/odb/src/defin/create_box.h
index a25a80736fc..cd9fc56cbb6 100644
--- a/src/odb/src/defin/create_box.h
+++ b/src/odb/src/defin/create_box.h
@@ -32,8 +32,9 @@
 
 #pragma once
 
-#include "db.h"
-#include "odb.h"
+#include "odb/db.h"
+#include "odb/odb.h"
+
 namespace utl {
 class Logger;
 }
diff --git a/src/odb/src/defin/defin.cpp b/src/odb/src/defin/defin.cpp
index c5a6392565f..512e2cb136f 100644
--- a/src/odb/src/defin/defin.cpp
+++ b/src/odb/src/defin/defin.cpp
@@ -30,10 +30,10 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "defin.h"
+#include "odb/defin.h"
 
-#include "db.h"
 #include "definReader.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definBase.cpp b/src/odb/src/defin/definBase.cpp
index a9a7064ce7f..87c0949b075 100644
--- a/src/odb/src/defin/definBase.cpp
+++ b/src/odb/src/defin/definBase.cpp
@@ -32,8 +32,8 @@
 
 #include "definBase.h"
 
-#include "db.h"
 #include "defiUtil.hpp"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definBase.h b/src/odb/src/defin/definBase.h
index 3788820f08d..d13b39f8c05 100644
--- a/src/odb/src/defin/definBase.h
+++ b/src/odb/src/defin/definBase.h
@@ -35,12 +35,12 @@
 #include <cmath>
 #include <vector>
 
-#include "dbTypes.h"
 #include "defiMisc.hpp"
-#include "defin.h"
 #include "definTypes.h"
-#include "geom.h"
-#include "odb.h"
+#include "odb/dbTypes.h"
+#include "odb/defin.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace utl {
 class Logger;
diff --git a/src/odb/src/defin/definBlockage.cpp b/src/odb/src/defin/definBlockage.cpp
index 59cbe3cc9f5..de0b9702a3a 100644
--- a/src/odb/src/defin/definBlockage.cpp
+++ b/src/odb/src/defin/definBlockage.cpp
@@ -36,9 +36,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "dbShape.h"
 #include "definPolygon.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definBlockage.h b/src/odb/src/defin/definBlockage.h
index a21a1d9023d..6b69cbe6d00 100644
--- a/src/odb/src/defin/definBlockage.h
+++ b/src/odb/src/defin/definBlockage.h
@@ -33,7 +33,7 @@
 #pragma once
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definComponent.cpp b/src/odb/src/defin/definComponent.cpp
index 6a725dd6dbd..3dad11fd18d 100644
--- a/src/odb/src/defin/definComponent.cpp
+++ b/src/odb/src/defin/definComponent.cpp
@@ -32,15 +32,16 @@
 
 #include "definComponent.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 
-#include "db.h"
-#include "dbTransform.h"
 #include "defiComponent.hpp"
 #include "defiUtil.hpp"
+#include "odb/db.h"
+#include "odb/dbTransform.h"
 #include "utl/Logger.h"
+
 namespace odb {
 
 definComponent::definComponent()
diff --git a/src/odb/src/defin/definComponent.h b/src/odb/src/defin/definComponent.h
index 998e4562a3c..a4480c10e1f 100644
--- a/src/odb/src/defin/definComponent.h
+++ b/src/odb/src/defin/definComponent.h
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definFill.cpp b/src/odb/src/defin/definFill.cpp
index 8063ecf9b10..fa8a337c2ba 100644
--- a/src/odb/src/defin/definFill.cpp
+++ b/src/odb/src/defin/definFill.cpp
@@ -32,13 +32,14 @@
 
 #include "definFill.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 
-#include "db.h"
-#include "dbShape.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
+
 namespace odb {
 
 definFill::definFill()
diff --git a/src/odb/src/defin/definFill.h b/src/odb/src/defin/definFill.h
index 3718d3b374c..c01de456e34 100644
--- a/src/odb/src/defin/definFill.h
+++ b/src/odb/src/defin/definFill.h
@@ -33,7 +33,7 @@
 #pragma once
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definGCell.cpp b/src/odb/src/defin/definGCell.cpp
index edd8003e1a9..7f8c165cac8 100644
--- a/src/odb/src/defin/definGCell.cpp
+++ b/src/odb/src/defin/definGCell.cpp
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "dbShape.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definGCell.h b/src/odb/src/defin/definGCell.h
index 93cc441a452..9b45c0b0859 100644
--- a/src/odb/src/defin/definGCell.h
+++ b/src/odb/src/defin/definGCell.h
@@ -33,7 +33,7 @@
 #pragma once
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definGroup.cpp b/src/odb/src/defin/definGroup.cpp
index 85631c604b3..f4c56f6c3ae 100644
--- a/src/odb/src/defin/definGroup.cpp
+++ b/src/odb/src/defin/definGroup.cpp
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "db.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definGroup.h b/src/odb/src/defin/definGroup.h
index 3b8b0dd0aeb..13cfefe0977 100644
--- a/src/odb/src/defin/definGroup.h
+++ b/src/odb/src/defin/definGroup.h
@@ -29,7 +29,7 @@
 #pragma once
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definNet.cpp b/src/odb/src/defin/definNet.cpp
index 52ef5f208a7..5d628b9de8e 100644
--- a/src/odb/src/defin/definNet.cpp
+++ b/src/odb/src/defin/definNet.cpp
@@ -32,14 +32,15 @@
 
 #include "definNet.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 
-#include "db.h"
-#include "dbShape.h"
-#include "dbWireCodec.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbWireCodec.h"
 #include "utl/Logger.h"
+
 namespace odb {
 
 inline uint get_net_dbid(const char* name)
diff --git a/src/odb/src/defin/definNet.h b/src/odb/src/defin/definNet.h
index fcaafb27614..a59f2f5bd2f 100644
--- a/src/odb/src/defin/definNet.h
+++ b/src/odb/src/defin/definNet.h
@@ -35,9 +35,9 @@
 #include <map>
 #include <string>
 
-#include "dbWireCodec.h"
 #include "definBase.h"
-#include "odb.h"
+#include "odb/dbWireCodec.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definNonDefaultRule.cpp b/src/odb/src/defin/definNonDefaultRule.cpp
index 9a6e116fde1..8cb8eaff537 100644
--- a/src/odb/src/defin/definNonDefaultRule.cpp
+++ b/src/odb/src/defin/definNonDefaultRule.cpp
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definNonDefaultRule.h b/src/odb/src/defin/definNonDefaultRule.h
index 1fddc26fbdc..cb54919b1d8 100644
--- a/src/odb/src/defin/definNonDefaultRule.h
+++ b/src/odb/src/defin/definNonDefaultRule.h
@@ -33,8 +33,8 @@
 #pragma once
 
 #include "definBase.h"
-#include "geom.h"
-#include "odb.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definPin.cpp b/src/odb/src/defin/definPin.cpp
index 17c70fa1226..e5ad6a71e55 100644
--- a/src/odb/src/defin/definPin.cpp
+++ b/src/odb/src/defin/definPin.cpp
@@ -36,9 +36,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "dbShape.h"
-#include "dbTransform.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
+#include "odb/dbTransform.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definPin.h b/src/odb/src/defin/definPin.h
index abc9ec48336..73caad84b3c 100644
--- a/src/odb/src/defin/definPin.h
+++ b/src/odb/src/defin/definPin.h
@@ -34,11 +34,11 @@
 
 #include <string>
 
-#include "dbTypes.h"
 #include "definBase.h"
 #include "definPolygon.h"
-#include "geom.h"
-#include "odb.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definPinProps.cpp b/src/odb/src/defin/definPinProps.cpp
index dec4db35bcd..6ef7e434c9a 100644
--- a/src/odb/src/defin/definPinProps.cpp
+++ b/src/odb/src/defin/definPinProps.cpp
@@ -38,7 +38,7 @@
 
 #include <string>
 
-#include "db.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definPinProps.h b/src/odb/src/defin/definPinProps.h
index b807b8fd125..66a7c935084 100644
--- a/src/odb/src/defin/definPinProps.h
+++ b/src/odb/src/defin/definPinProps.h
@@ -32,10 +32,10 @@
 
 #pragma once
 
-#include "dbTypes.h"
 #include "definBase.h"
-#include "geom.h"
-#include "odb.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definPolygon.cpp b/src/odb/src/defin/definPolygon.cpp
index f5826c9be77..b3986875062 100644
--- a/src/odb/src/defin/definPolygon.cpp
+++ b/src/odb/src/defin/definPolygon.cpp
@@ -34,7 +34,7 @@
 
 #include <algorithm>
 
-#include "poly_decomp.h"
+#include "odb/poly_decomp.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definPolygon.h b/src/odb/src/defin/definPolygon.h
index 0b8d1380477..63fa008182c 100644
--- a/src/odb/src/defin/definPolygon.h
+++ b/src/odb/src/defin/definPolygon.h
@@ -34,8 +34,8 @@
 
 #include <vector>
 
-#include "geom.h"
-#include "odb.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definPropDefs.cpp b/src/odb/src/defin/definPropDefs.cpp
index f8f819337e3..5eebfa81b47 100644
--- a/src/odb/src/defin/definPropDefs.cpp
+++ b/src/odb/src/defin/definPropDefs.cpp
@@ -32,7 +32,7 @@
 
 #include "definPropDefs.h"
 
-#include "db.h"
+#include "odb/db.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definReader.cpp b/src/odb/src/defin/definReader.cpp
index 35a75626d0b..096d83396c2 100644
--- a/src/odb/src/defin/definReader.cpp
+++ b/src/odb/src/defin/definReader.cpp
@@ -38,8 +38,6 @@
 
 #include <string>
 
-#include "db.h"
-#include "dbShape.h"
 #include "definBlockage.h"
 #include "definComponent.h"
 #include "definComponentMaskShift.h"
@@ -57,6 +55,8 @@
 #include "definTracks.h"
 #include "definVia.h"
 #include "defzlib.hpp"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 
 #define UNSUPPORTED(msg)              \
diff --git a/src/odb/src/defin/definReader.h b/src/odb/src/defin/definReader.h
index 74164666932..1cb12775caa 100644
--- a/src/odb/src/defin/definReader.h
+++ b/src/odb/src/defin/definReader.h
@@ -34,7 +34,7 @@
 
 #include "definBase.h"
 #include "defrReader.hpp"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace utl {
 class Logger;
diff --git a/src/odb/src/defin/definRegion.cpp b/src/odb/src/defin/definRegion.cpp
index ab8d5274ce8..20a14c97bc3 100644
--- a/src/odb/src/defin/definRegion.cpp
+++ b/src/odb/src/defin/definRegion.cpp
@@ -38,7 +38,7 @@
 
 #include <string>
 
-#include "db.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definRegion.h b/src/odb/src/defin/definRegion.h
index bf69ec2f0ec..075bad58254 100644
--- a/src/odb/src/defin/definRegion.h
+++ b/src/odb/src/defin/definRegion.h
@@ -33,7 +33,7 @@
 #pragma once
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definRow.cpp b/src/odb/src/defin/definRow.cpp
index c36c4dfbaa0..a7b4eec7a8c 100644
--- a/src/odb/src/defin/definRow.cpp
+++ b/src/odb/src/defin/definRow.cpp
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "dbShape.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definRow.h b/src/odb/src/defin/definRow.h
index 03442a81530..d2c21f323eb 100644
--- a/src/odb/src/defin/definRow.h
+++ b/src/odb/src/defin/definRow.h
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definSNet.cpp b/src/odb/src/defin/definSNet.cpp
index 0a1f582507e..c9984f09cd1 100644
--- a/src/odb/src/defin/definSNet.cpp
+++ b/src/odb/src/defin/definSNet.cpp
@@ -37,9 +37,9 @@
 #include <stdlib.h>
 
 #include "create_box.h"
-#include "db.h"
-#include "dbShape.h"
 #include "definPolygon.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definSNet.h b/src/odb/src/defin/definSNet.h
index 1ce9590af25..74eb7693b16 100644
--- a/src/odb/src/defin/definSNet.h
+++ b/src/odb/src/defin/definSNet.h
@@ -35,9 +35,9 @@
 #include <map>
 #include <vector>
 
-#include "db.h"
 #include "definBase.h"
-#include "odb.h"
+#include "odb/db.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definTracks.cpp b/src/odb/src/defin/definTracks.cpp
index ecdddd3d94c..5ac32997107 100644
--- a/src/odb/src/defin/definTracks.cpp
+++ b/src/odb/src/defin/definTracks.cpp
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "dbShape.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definTracks.h b/src/odb/src/defin/definTracks.h
index 5e3b1a5b1f8..531bbfd5285 100644
--- a/src/odb/src/defin/definTracks.h
+++ b/src/odb/src/defin/definTracks.h
@@ -36,7 +36,7 @@
 #include <vector>
 
 #include "definBase.h"
-#include "odb.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/defin/definVia.cpp b/src/odb/src/defin/definVia.cpp
index 23da512f331..42fafaeee96 100644
--- a/src/odb/src/defin/definVia.cpp
+++ b/src/odb/src/defin/definVia.cpp
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "db.h"
-#include "dbShape.h"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/defin/definVia.h b/src/odb/src/defin/definVia.h
index 83ad5bc2869..38976ec8484 100644
--- a/src/odb/src/defin/definVia.h
+++ b/src/odb/src/defin/definVia.h
@@ -32,9 +32,9 @@
 
 #pragma once
 
-#include "db.h"
 #include "definBase.h"
-#include "odb.h"
+#include "odb/db.h"
+#include "odb/odb.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/ArraySpacingParser.cpp b/src/odb/src/lefin/ArraySpacingParser.cpp
index b36d409ee02..38a07b1835a 100644
--- a/src/odb/src/lefin/ArraySpacingParser.cpp
+++ b/src/odb/src/lefin/ArraySpacingParser.cpp
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 using namespace odb;
 
diff --git a/src/odb/src/lefin/KeepOutZoneParser.cpp b/src/odb/src/lefin/KeepOutZoneParser.cpp
index 4bc38629f89..2657eb5008c 100644
--- a/src/odb/src/lefin/KeepOutZoneParser.cpp
+++ b/src/odb/src/lefin/KeepOutZoneParser.cpp
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 using namespace odb;
 
diff --git a/src/odb/src/lefin/MetalWidthViaMapParser.cpp b/src/odb/src/lefin/MetalWidthViaMapParser.cpp
index ef8168103a3..1fa23f1d790 100644
--- a/src/odb/src/lefin/MetalWidthViaMapParser.cpp
+++ b/src/odb/src/lefin/MetalWidthViaMapParser.cpp
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 using namespace odb;
 void MetalWidthViaMapParser::addEntry(
diff --git a/src/odb/src/lefin/MinCutParser.cpp b/src/odb/src/lefin/MinCutParser.cpp
index a3eef77f74d..f5cd7f291d5 100644
--- a/src/odb/src/lefin/MinCutParser.cpp
+++ b/src/odb/src/lefin/MinCutParser.cpp
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 using namespace odb;
 
diff --git a/src/odb/src/lefin/WidthTableParser.cpp b/src/odb/src/lefin/WidthTableParser.cpp
index 66677b7d03f..5adc1dee5bb 100644
--- a/src/odb/src/lefin/WidthTableParser.cpp
+++ b/src/odb/src/lefin/WidthTableParser.cpp
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 using namespace odb;
 
diff --git a/src/odb/src/lefin/lefLayerPropParser.h b/src/odb/src/lefin/lefLayerPropParser.h
index 4f99710ec8f..e05d13d07ce 100644
--- a/src/odb/src/lefin/lefLayerPropParser.h
+++ b/src/odb/src/lefin/lefLayerPropParser.h
@@ -34,8 +34,9 @@
 #include <string>
 #include <vector>
 
-#include "db.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
+
 namespace utl {
 class Logger;
 }
diff --git a/src/odb/src/lefin/lefMacroClassParser.cpp b/src/odb/src/lefin/lefMacroClassParser.cpp
index 1c8c3e27e45..fe437afebf4 100644
--- a/src/odb/src/lefin/lefMacroClassParser.cpp
+++ b/src/odb/src/lefin/lefMacroClassParser.cpp
@@ -28,9 +28,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefMacroPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefMacroClassType {
 
diff --git a/src/odb/src/lefin/lefMacroPropParser.h b/src/odb/src/lefin/lefMacroPropParser.h
index 0e917e1431c..9959260955a 100644
--- a/src/odb/src/lefin/lefMacroPropParser.h
+++ b/src/odb/src/lefin/lefMacroPropParser.h
@@ -28,7 +28,7 @@
 
 #include <string_view>
 
-#include "db.h"
+#include "odb/db.h"
 
 namespace odb {
 class lefMacroClassTypeParser
diff --git a/src/odb/src/lefin/lefTechLayerAreaRuleParser.cpp b/src/odb/src/lefin/lefTechLayerAreaRuleParser.cpp
index f871d72faca..fa646382a5b 100644
--- a/src/odb/src/lefin/lefTechLayerAreaRuleParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerAreaRuleParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/lefTechLayerCornerSpacingParser.cpp b/src/odb/src/lefin/lefTechLayerCornerSpacingParser.cpp
index 2a23e6e871f..a501f25c345 100644
--- a/src/odb/src/lefin/lefTechLayerCornerSpacingParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerCornerSpacingParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerCornerSpacing {
 
diff --git a/src/odb/src/lefin/lefTechLayerCutClassParser.cpp b/src/odb/src/lefin/lefTechLayerCutClassParser.cpp
index 0cb940cca4e..f0ce307cea4 100644
--- a/src/odb/src/lefin/lefTechLayerCutClassParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerCutClassParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerCutClass {
 
diff --git a/src/odb/src/lefin/lefTechLayerCutEnclosureParser.cpp b/src/odb/src/lefin/lefTechLayerCutEnclosureParser.cpp
index 9fa6b3118a5..966b2b6a7f2 100644
--- a/src/odb/src/lefin/lefTechLayerCutEnclosureParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerCutEnclosureParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/lefTechLayerCutSpacingParser.cpp b/src/odb/src/lefin/lefTechLayerCutSpacingParser.cpp
index 6eb59401708..ebdf01eef19 100644
--- a/src/odb/src/lefin/lefTechLayerCutSpacingParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerCutSpacingParser.cpp
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerCutSpacing {
 
diff --git a/src/odb/src/lefin/lefTechLayerCutSpacingTableParser.cpp b/src/odb/src/lefin/lefTechLayerCutSpacingTableParser.cpp
index e8cd1f10443..fa7864d4320 100644
--- a/src/odb/src/lefin/lefTechLayerCutSpacingTableParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerCutSpacingTableParser.cpp
@@ -30,9 +30,9 @@
 #include <vector>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerCutSpacingTable {
 
diff --git a/src/odb/src/lefin/lefTechLayerEolExtensionParser.cpp b/src/odb/src/lefin/lefTechLayerEolExtensionParser.cpp
index 4a382dd477f..51d00ec3bd1 100644
--- a/src/odb/src/lefin/lefTechLayerEolExtensionParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerEolExtensionParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/lefTechLayerEolKeepOutRuleParser.cpp b/src/odb/src/lefin/lefTechLayerEolKeepOutRuleParser.cpp
index 7cea41e68fa..929792e6303 100644
--- a/src/odb/src/lefin/lefTechLayerEolKeepOutRuleParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerEolKeepOutRuleParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/lefTechLayerForbiddenSpacingRuleParser.cpp b/src/odb/src/lefin/lefTechLayerForbiddenSpacingRuleParser.cpp
index 5c96fdd854f..4a7950532e7 100644
--- a/src/odb/src/lefin/lefTechLayerForbiddenSpacingRuleParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerForbiddenSpacingRuleParser.cpp
@@ -34,9 +34,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
@@ -135,4 +135,4 @@ bool lefTechLayerForbiddenSpacingRuleParser::parseSubRule(
   return valid;
 }
 
-}  // namespace odb
\ No newline at end of file
+}  // namespace odb
diff --git a/src/odb/src/lefin/lefTechLayerMinStepParser.cpp b/src/odb/src/lefin/lefTechLayerMinStepParser.cpp
index 4233e02b865..a5740260e83 100644
--- a/src/odb/src/lefin/lefTechLayerMinStepParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerMinStepParser.cpp
@@ -28,9 +28,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/lefTechLayerPitchRuleParser.cpp b/src/odb/src/lefin/lefTechLayerPitchRuleParser.cpp
index c14d35dca5e..1cfd37626f0 100644
--- a/src/odb/src/lefin/lefTechLayerPitchRuleParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerPitchRuleParser.cpp
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
diff --git a/src/odb/src/lefin/lefTechLayerRectOnlyParser.cpp b/src/odb/src/lefin/lefTechLayerRectOnlyParser.cpp
index de93cbf73e4..833cf78436f 100644
--- a/src/odb/src/lefin/lefTechLayerRectOnlyParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerRectOnlyParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerRectOnly {
 
diff --git a/src/odb/src/lefin/lefTechLayerRightWayOnGridOnlyParser.cpp b/src/odb/src/lefin/lefTechLayerRightWayOnGridOnlyParser.cpp
index 7223481cf3c..0e913e218ab 100644
--- a/src/odb/src/lefin/lefTechLayerRightWayOnGridOnlyParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerRightWayOnGridOnlyParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerRightWayOnGridOnly {
 
diff --git a/src/odb/src/lefin/lefTechLayerSpacingEolParser.cpp b/src/odb/src/lefin/lefTechLayerSpacingEolParser.cpp
index cf56b9e9960..e76d994966b 100644
--- a/src/odb/src/lefin/lefTechLayerSpacingEolParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerSpacingEolParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerSpacingEol {
 
diff --git a/src/odb/src/lefin/lefTechLayerSpacingTablePrlParser.cpp b/src/odb/src/lefin/lefTechLayerSpacingTablePrlParser.cpp
index 88d1b6fb4f8..55836f3dd1a 100644
--- a/src/odb/src/lefin/lefTechLayerSpacingTablePrlParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerSpacingTablePrlParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerSpacingTablePrl {
 
diff --git a/src/odb/src/lefin/lefTechLayerTwoWiresForbiddenSpcRuleParser.cpp b/src/odb/src/lefin/lefTechLayerTwoWiresForbiddenSpcRuleParser.cpp
index 574bfb2e70e..02459343412 100644
--- a/src/odb/src/lefin/lefTechLayerTwoWiresForbiddenSpcRuleParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerTwoWiresForbiddenSpcRuleParser.cpp
@@ -34,9 +34,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace odb {
 
@@ -136,4 +136,4 @@ bool lefTechLayerTwoWiresForbiddenSpcRuleParser::parseSubRule(
   return valid;
 }
 
-}  // namespace odb
\ No newline at end of file
+}  // namespace odb
diff --git a/src/odb/src/lefin/lefTechLayerTypeParser.cpp b/src/odb/src/lefin/lefTechLayerTypeParser.cpp
index 21f8bbd743b..7edd7650b25 100644
--- a/src/odb/src/lefin/lefTechLayerTypeParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerTypeParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerType {
 
diff --git a/src/odb/src/lefin/lefTechLayerWrongDirSpacingParser.cpp b/src/odb/src/lefin/lefTechLayerWrongDirSpacingParser.cpp
index d3f9d0a39f3..f52b134a267 100644
--- a/src/odb/src/lefin/lefTechLayerWrongDirSpacingParser.cpp
+++ b/src/odb/src/lefin/lefTechLayerWrongDirSpacingParser.cpp
@@ -29,9 +29,9 @@
 #include <string>
 
 #include "boostParser.h"
-#include "db.h"
 #include "lefLayerPropParser.h"
-#include "lefin.h"
+#include "odb/db.h"
+#include "odb/lefin.h"
 
 namespace lefTechLayerWrongDirSpacing {
 
diff --git a/src/odb/src/lefin/lefin.cpp b/src/odb/src/lefin/lefin.cpp
index 900e05e1631..b6f907be9c4 100644
--- a/src/odb/src/lefin/lefin.cpp
+++ b/src/odb/src/lefin/lefin.cpp
@@ -30,7 +30,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "lefin.h"
+#include "odb/lefin.h"
 
 #include <ctype.h>
 #include <stdio.h>
@@ -42,15 +42,15 @@
 #include <string>
 #include <vector>
 
-#include "db.h"
-#include "dbTransform.h"
-#include "geom.h"
 #include "lefLayerPropParser.h"
 #include "lefMacroPropParser.h"
 #include "lefiDebug.hpp"
 #include "lefiUtil.hpp"
 #include "lefrReader.hpp"
-#include "poly_decomp.h"
+#include "odb/db.h"
+#include "odb/dbTransform.h"
+#include "odb/geom.h"
+#include "odb/poly_decomp.h"
 #include "utl/Logger.h"
 namespace odb {
 
diff --git a/src/odb/src/lefin/reader.cpp b/src/odb/src/lefin/reader.cpp
index 69e0c1027fd..269271a3dcb 100644
--- a/src/odb/src/lefin/reader.cpp
+++ b/src/odb/src/lefin/reader.cpp
@@ -39,9 +39,9 @@
 
 #include "lefiDebug.hpp"
 #include "lefiUtil.hpp"
-#include "lefin.h"
 #include "lefrReader.hpp"
 #include "lefzlib.hpp"
+#include "odb/lefin.h"
 #include "utl/Logger.h"
 
 namespace odb {