diff --git a/src/dpo/src/detailed_random.h b/src/dpo/src/detailed_random.h
index cf7a5b5fdd1..06ff7ec885a 100644
--- a/src/dpo/src/detailed_random.h
+++ b/src/dpo/src/detailed_random.h
@@ -47,6 +47,8 @@ namespace dpo {
 class Architecture;
 class DetailedMgr;
 class DetailedObjective;
+class Network;
+class RoutingParams;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Classes.
diff --git a/src/dpo/src/detailed_segment.h b/src/dpo/src/detailed_segment.h
index 1d5ebdfc801..fae713ee03b 100644
--- a/src/dpo/src/detailed_segment.h
+++ b/src/dpo/src/detailed_segment.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <limits>
+
 namespace dpo {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/dpo/src/rectangle.h b/src/dpo/src/rectangle.h
index 223344cf89d..0152b268e68 100644
--- a/src/dpo/src/rectangle.h
+++ b/src/dpo/src/rectangle.h
@@ -34,6 +34,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
+#include <algorithm>
 #include <limits>
 
 namespace dpo {
diff --git a/src/gpl/include/gpl/Replace.h b/src/gpl/include/gpl/Replace.h
index 7d544013943..b47b0578da3 100644
--- a/src/gpl/include/gpl/Replace.h
+++ b/src/gpl/include/gpl/Replace.h
@@ -193,7 +193,6 @@ class Replace
   float routabilityRcK3_ = 0.0;
   float routabilityRcK4_ = 0.0;
 
-  int routabilityMaxBloatIter_ = 1;
   int routabilityMaxInflationIter_ = 4;
 
   float timingNetWeightMax_ = 1.9;
diff --git a/src/gpl/src/mbff.cpp b/src/gpl/src/mbff.cpp
index bf113ebb5a9..b3e7f5d1e74 100644
--- a/src/gpl/src/mbff.cpp
+++ b/src/gpl/src/mbff.cpp
@@ -2115,8 +2115,6 @@ void MBFF::SetTrayNames()
 
 void MBFF::Run(const int mx_sz, const float alpha, const float beta)
 {
-  auto start = std::chrono::high_resolution_clock::now();
-
   std::srand(1);
   omp_set_num_threads(num_threads_);
 
@@ -2177,10 +2175,6 @@ void MBFF::Run(const int mx_sz, const float alpha, const float beta)
     odb::dbInst::destroy(inst);
   }
 
-  auto end = std::chrono::high_resolution_clock::now();
-  auto duration
-      = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-
   log_->report("Alpha = {}, Beta = {}, #paths = {}, max size = {}",
                alpha,
                beta,
diff --git a/src/gui/src/findDialog.h b/src/gui/src/findDialog.h
index bc8b917c215..cf3da4f8b4c 100644
--- a/src/gui/src/findDialog.h
+++ b/src/gui/src/findDialog.h
@@ -43,8 +43,8 @@ class FindObjectDialog : public QDialog, public Ui::FindObjDialog
  public:
   FindObjectDialog(QWidget* parent = nullptr);
  public slots:
-  void accept();
-  void reject();
+  void accept() override;
+  void reject() override;
   int exec() override;
 };
 }  // namespace gui
diff --git a/src/gui/src/mainWindow.cpp b/src/gui/src/mainWindow.cpp
index bfec4295e6c..7437cfaefe6 100644
--- a/src/gui/src/mainWindow.cpp
+++ b/src/gui/src/mainWindow.cpp
@@ -549,17 +549,15 @@ void MainWindow::init(sta::dbSta* sta, const std::string& help_path)
       new DbMarkerCategoryDescriptor(db_));
   gui->registerDescriptor<odb::dbMarker*>(new DbMarkerDescriptor(db_));
 
-  gui->registerDescriptor<sta::Corner*>(new CornerDescriptor(db_, sta));
+  gui->registerDescriptor<sta::Corner*>(new CornerDescriptor(sta));
   gui->registerDescriptor<sta::LibertyLibrary*>(
-      new LibertyLibraryDescriptor(db_, sta));
-  gui->registerDescriptor<sta::LibertyCell*>(
-      new LibertyCellDescriptor(db_, sta));
-  gui->registerDescriptor<sta::LibertyPort*>(
-      new LibertyPortDescriptor(db_, sta));
+      new LibertyLibraryDescriptor(sta));
+  gui->registerDescriptor<sta::LibertyCell*>(new LibertyCellDescriptor(sta));
+  gui->registerDescriptor<sta::LibertyPort*>(new LibertyPortDescriptor(sta));
   gui->registerDescriptor<sta::LibertyPgPort*>(
-      new LibertyPgPortDescriptor(db_, sta));
-  gui->registerDescriptor<sta::Instance*>(new StaInstanceDescriptor(db_, sta));
-  gui->registerDescriptor<sta::Clock*>(new ClockDescriptor(db_, sta));
+      new LibertyPgPortDescriptor(sta));
+  gui->registerDescriptor<sta::Instance*>(new StaInstanceDescriptor(sta));
+  gui->registerDescriptor<sta::Clock*>(new ClockDescriptor(sta));
 
   gui->registerDescriptor<BufferTree>(
       new BufferTreeDescriptor(db_,
diff --git a/src/gui/src/staDescriptors.cpp b/src/gui/src/staDescriptors.cpp
index 836496c1d9c..ff0548ea3e3 100644
--- a/src/gui/src/staDescriptors.cpp
+++ b/src/gui/src/staDescriptors.cpp
@@ -97,9 +97,7 @@ static void add_limit(Descriptor::Properties& props,
 
 //////////////////////////////////////////////////
 
-LibertyLibraryDescriptor::LibertyLibraryDescriptor(odb::dbDatabase* db,
-                                                   sta::dbSta* sta)
-    : db_(db), sta_(sta)
+LibertyLibraryDescriptor::LibertyLibraryDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
@@ -255,9 +253,7 @@ bool LibertyLibraryDescriptor::getAllObjects(SelectionSet& objects) const
 
 //////////////////////////////////////////////////
 
-LibertyCellDescriptor::LibertyCellDescriptor(odb::dbDatabase* db,
-                                             sta::dbSta* sta)
-    : db_(db), sta_(sta)
+LibertyCellDescriptor::LibertyCellDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
@@ -397,9 +393,7 @@ bool LibertyCellDescriptor::getAllObjects(SelectionSet& objects) const
 
 //////////////////////////////////////////////////
 
-LibertyPortDescriptor::LibertyPortDescriptor(odb::dbDatabase* db,
-                                             sta::dbSta* sta)
-    : db_(db), sta_(sta)
+LibertyPortDescriptor::LibertyPortDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
@@ -592,9 +586,7 @@ static const char* typeNameStr(sta::LibertyPgPort::PgType type)
   return "<unexpected>";
 }
 
-LibertyPgPortDescriptor::LibertyPgPortDescriptor(odb::dbDatabase* db,
-                                                 sta::dbSta* sta)
-    : db_(db), sta_(sta)
+LibertyPgPortDescriptor::LibertyPgPortDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
@@ -689,8 +681,7 @@ odb::dbMTerm* LibertyPgPortDescriptor::getMTerm(const std::any& object) const
   return mterm;
 }
 
-CornerDescriptor::CornerDescriptor(odb::dbDatabase* db, sta::dbSta* sta)
-    : db_(db), sta_(sta)
+CornerDescriptor::CornerDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
@@ -756,9 +747,7 @@ bool CornerDescriptor::getAllObjects(SelectionSet& objects) const
   return true;
 }
 
-StaInstanceDescriptor::StaInstanceDescriptor(odb::dbDatabase* db,
-                                             sta::dbSta* sta)
-    : db_(db), sta_(sta)
+StaInstanceDescriptor::StaInstanceDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
@@ -924,8 +913,7 @@ bool StaInstanceDescriptor::getAllObjects(SelectionSet& objects) const
   return true;
 }
 
-ClockDescriptor::ClockDescriptor(odb::dbDatabase* db, sta::dbSta* sta)
-    : db_(db), sta_(sta)
+ClockDescriptor::ClockDescriptor(sta::dbSta* sta) : sta_(sta)
 {
 }
 
diff --git a/src/gui/src/staDescriptors.h b/src/gui/src/staDescriptors.h
index 9aa5be2127f..cad7081a2ed 100644
--- a/src/gui/src/staDescriptors.h
+++ b/src/gui/src/staDescriptors.h
@@ -51,7 +51,7 @@ namespace gui {
 class LibertyLibraryDescriptor : public Descriptor
 {
  public:
-  LibertyLibraryDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  LibertyLibraryDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -66,14 +66,13 @@ class LibertyLibraryDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
   sta::dbSta* sta_;
 };
 
 class LibertyCellDescriptor : public Descriptor
 {
  public:
-  LibertyCellDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  LibertyCellDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -88,14 +87,13 @@ class LibertyCellDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
   sta::dbSta* sta_;
 };
 
 class LibertyPortDescriptor : public Descriptor
 {
  public:
-  LibertyPortDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  LibertyPortDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -110,14 +108,13 @@ class LibertyPortDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
   sta::dbSta* sta_;
 };
 
 class LibertyPgPortDescriptor : public Descriptor
 {
  public:
-  LibertyPgPortDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  LibertyPgPortDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -132,16 +129,15 @@ class LibertyPgPortDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
-  sta::dbSta* sta_;
-
   odb::dbMTerm* getMTerm(const std::any& object) const;
+
+  sta::dbSta* sta_;
 };
 
 class CornerDescriptor : public Descriptor
 {
  public:
-  CornerDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  CornerDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -156,14 +152,13 @@ class CornerDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
   sta::dbSta* sta_;
 };
 
 class StaInstanceDescriptor : public Descriptor
 {
  public:
-  StaInstanceDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  StaInstanceDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -178,7 +173,6 @@ class StaInstanceDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
   sta::dbSta* sta_;
 
   static constexpr int float_precision_ = 2;
@@ -187,7 +181,7 @@ class StaInstanceDescriptor : public Descriptor
 class ClockDescriptor : public Descriptor
 {
  public:
-  ClockDescriptor(odb::dbDatabase* db, sta::dbSta* sta);
+  ClockDescriptor(sta::dbSta* sta);
 
   std::string getName(std::any object) const override;
   std::string getTypeName() const override;
@@ -202,7 +196,6 @@ class ClockDescriptor : public Descriptor
   bool getAllObjects(SelectionSet& objects) const override;
 
  private:
-  odb::dbDatabase* db_;
   sta::dbSta* sta_;
 
   std::set<const sta::Pin*> getClockPins(sta::Clock* clock) const;
diff --git a/src/mpl2/src/hier_rtlmp.cpp b/src/mpl2/src/hier_rtlmp.cpp
index ee5fa404125..a52326fd96e 100644
--- a/src/mpl2/src/hier_rtlmp.cpp
+++ b/src/mpl2/src/hier_rtlmp.cpp
@@ -69,12 +69,10 @@ HierRTLMP::~HierRTLMP() = default;
 // Constructors
 HierRTLMP::HierRTLMP(sta::dbNetwork* network,
                      odb::dbDatabase* db,
-                     sta::dbSta* sta,
                      utl::Logger* logger,
                      par::PartitionMgr* tritonpart)
     : network_(network),
       db_(db),
-      sta_(sta),
       logger_(logger),
       tritonpart_(tritonpart),
       tree_(std::make_unique<PhysicalHierarchy>())
@@ -1058,18 +1056,10 @@ HierRTLMP::IOSpans HierRTLMP::computeIOSpans()
 float HierRTLMP::computeIOBlockagesDepth(const IOSpans& io_spans)
 {
   float sum_length = 0.0;
-  int num_hor_access = 0;
-  int num_ver_access = 0;
 
   for (auto& [pin_access, length] : io_spans) {
     if (length.second > length.first) {
       sum_length += std::abs(length.second - length.first);
-
-      if (pin_access == R || pin_access == L) {
-        num_hor_access++;
-      } else {
-        num_ver_access++;
-      }
     }
   }
 
diff --git a/src/mpl2/src/hier_rtlmp.h b/src/mpl2/src/hier_rtlmp.h
index 5515fb3f01c..8a09798e401 100644
--- a/src/mpl2/src/hier_rtlmp.h
+++ b/src/mpl2/src/hier_rtlmp.h
@@ -99,7 +99,6 @@ class HierRTLMP
  public:
   HierRTLMP(sta::dbNetwork* network,
             odb::dbDatabase* db,
-            sta::dbSta* sta,
             utl::Logger* logger,
             par::PartitionMgr* tritonpart);
   ~HierRTLMP();
@@ -252,7 +251,6 @@ class HierRTLMP
   sta::dbNetwork* network_ = nullptr;
   odb::dbDatabase* db_ = nullptr;
   odb::dbBlock* block_ = nullptr;
-  sta::dbSta* sta_ = nullptr;
   utl::Logger* logger_ = nullptr;
   par::PartitionMgr* tritonpart_ = nullptr;
   std::unique_ptr<PhysicalHierarchy> tree_;
diff --git a/src/mpl2/src/rtl_mp.cpp b/src/mpl2/src/rtl_mp.cpp
index 1fb50850b8e..800e6ea9b22 100644
--- a/src/mpl2/src/rtl_mp.cpp
+++ b/src/mpl2/src/rtl_mp.cpp
@@ -54,8 +54,7 @@ void MacroPlacer2::init(sta::dbNetwork* network,
                         utl::Logger* logger,
                         par::PartitionMgr* tritonpart)
 {
-  hier_rtlmp_
-      = std::make_unique<HierRTLMP>(network, db, sta, logger, tritonpart);
+  hier_rtlmp_ = std::make_unique<HierRTLMP>(network, db, logger, tritonpart);
   logger_ = logger;
   db_ = db;
 }
diff --git a/src/odb/include/odb/dbBlockSet.h b/src/odb/include/odb/dbBlockSet.h
index 9f5c98f7abc..5d93b7ea45f 100644
--- a/src/odb/include/odb/dbBlockSet.h
+++ b/src/odb/include/odb/dbBlockSet.h
@@ -33,6 +33,7 @@
 #pragma once
 
 #include "dbObject.h"
+#include "dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/include/odb/dbCCSegSet.h b/src/odb/include/odb/dbCCSegSet.h
index 9245626a778..0a1ebd0fe54 100644
--- a/src/odb/include/odb/dbCCSegSet.h
+++ b/src/odb/include/odb/dbCCSegSet.h
@@ -33,6 +33,7 @@
 #pragma once
 
 #include "dbObject.h"
+#include "dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/include/odb/dbMap.hpp b/src/odb/include/odb/dbMap.hpp
index 36294a560bb..50f7999f50b 100644
--- a/src/odb/include/odb/dbMap.hpp
+++ b/src/odb/include/odb/dbMap.hpp
@@ -33,6 +33,7 @@
 #pragma once
 
 #include "ZException.h"
+#include "dbMap.h"
 
 namespace odb {
 
diff --git a/src/odb/include/odb/dbNetSet.h b/src/odb/include/odb/dbNetSet.h
index 23cb4aa7719..212fd66051a 100644
--- a/src/odb/include/odb/dbNetSet.h
+++ b/src/odb/include/odb/dbNetSet.h
@@ -33,6 +33,7 @@
 #pragma once
 
 #include "dbObject.h"
+#include "dbSet.h"
 
 namespace odb {
 
diff --git a/src/odb/src/db/dbModulePortItr.h b/src/odb/src/db/dbModulePortItr.h
index 00fb6124d1b..e50dfe1629c 100644
--- a/src/odb/src/db/dbModulePortItr.h
+++ b/src/odb/src/db/dbModulePortItr.h
@@ -62,9 +62,6 @@ class dbModulePortItr : public dbIterator
 
  private:
   dbTable<_dbModBTerm>* _modbterm_tbl;
-  // User Code Begin Fields
-  dbModulePortItr* _port_iter = nullptr;
-  // User Code End Fields
 };
 
 }  // namespace odb
diff --git a/src/odb/src/def/defdiff/diffDefRW.cpp b/src/odb/src/def/defdiff/diffDefRW.cpp
index 260d928ac90..e98d63f1f4d 100644
--- a/src/odb/src/def/defdiff/diffDefRW.cpp
+++ b/src/odb/src/def/defdiff/diffDefRW.cpp
@@ -808,10 +808,8 @@ int snetf(defrCallbackType_e c, defiNet* net, defiUserData ud)
         }
       }
       if (net->polyMask(i)) {
-        fprintf(fout,
-                "MASK %d POLYGON % s ",
-                net->polyMask(i),
-                net->polygonName(i));
+        fprintf(
+            fout, "MASK %d POLYGON %s ", net->polyMask(i), net->polygonName(i));
       } else {
         fprintf(fout, "POLYGON %s", net->polygonName(i));
       }
@@ -2467,9 +2465,6 @@ int diffDefReadFile(char* inFile,
                     char* ignoreViaName,
                     char* netSegComp)
 {
-  FILE* f;
-  int res;
-
   userData = (void*) 0x01020304;
   defrInit();
 
@@ -2542,6 +2537,7 @@ int diffDefReadFile(char* inFile,
   if (strcmp(netSegComp, "0") != 0)
     netSeCmp = 1;
 
+  FILE* f;
   if ((f = fopen(inFile, "r")) == nullptr) {
     fprintf(stderr, "Couldn't open input file '%s'\n", inFile);
     return (2);
@@ -2553,7 +2549,7 @@ int diffDefReadFile(char* inFile,
     return (2);
   }
 
-  res = defrRead(f, inFile, userData, 1);
+  const int res = defrRead(f, inFile, userData, 1);
 
   fclose(f);
   fclose(fout);
diff --git a/src/odb/src/def/defrw/defrw.cpp b/src/odb/src/def/defrw/defrw.cpp
index 85de07f1b98..ae8f0a0a74b 100644
--- a/src/odb/src/def/defrw/defrw.cpp
+++ b/src/odb/src/def/defrw/defrw.cpp
@@ -1279,7 +1279,7 @@ int snetf(defrCallbackType_e c, defiNet* net, defiUserData ud)
       }
       if (net->polyMask(i)) {
         fprintf(fout,
-                "\n  + MASK %d + POLYGON % s ",
+                "\n  + MASK %d + POLYGON %s ",
                 net->polyMask(i),
                 net->polygonName(i));
       } else {
@@ -3413,7 +3413,6 @@ int main(int argc, char** argv)
     // 2nd will enable 7016 by calling defrEnableParserMsgs
     // 3rd enable all msgs by call defrEnableAllMsgs
 
-    int nMsgs = 2;
     int dMsgs[2];
 
     for (fileCt = 0; fileCt < numInFile; fileCt++) {
diff --git a/src/odb/src/lef/lef/crypt.hpp b/src/odb/src/lef/lef/crypt.hpp
index 44e3c855c54..d8b5ff70aea 100644
--- a/src/odb/src/lef/lef/crypt.hpp
+++ b/src/odb/src/lef/lef/crypt.hpp
@@ -30,6 +30,8 @@
 #ifndef CRYPT_H
 #define CRYPT_H 1
 
+#include <cstdio>
+
 #include "lefiKRDefs.hpp"
 
 BEGIN_LEFDEF_PARSER_NAMESPACE
diff --git a/src/odb/src/lef/lef/lef_keywords.cpp b/src/odb/src/lef/lef/lef_keywords.cpp
index 01aadcd14d4..34f28bfa146 100644
--- a/src/odb/src/lef/lef/lef_keywords.cpp
+++ b/src/odb/src/lef/lef/lef_keywords.cpp
@@ -454,7 +454,7 @@ static int GetToken(char** buffer, int* bufferSize)
 
       // 7/23/2003 - pcr 606558 - do not allow \n in a string instead
       // of ;
-      if ((ch == '\n')) {
+      if (ch == '\n') {
         print_nlines(++lefData->lef_nlines);
         // 2/2/2007 - PCR 909714, allow string to go more than 1 line
         //            continue to parse
diff --git a/src/odb/src/lef/lef/lefwWriter.cpp b/src/odb/src/lef/lef/lefwWriter.cpp
index 1ed26086838..de71b6865b7 100644
--- a/src/odb/src/lef/lef/lefwWriter.cpp
+++ b/src/odb/src/lef/lef/lefwWriter.cpp
@@ -1078,7 +1078,7 @@ int lefwLayerCutSpacingAdjacent(int viaCuts,  // either 2, 3 or 4, optional
     return LEFW_BAD_ORDER;  // has to be after
   // lefwLayerCutSpacing is called
   if (lefwWriteEncrypt) {
-    if (viaCuts < 2 && viaCuts > 4)
+    if (viaCuts < 2 || viaCuts > 4)
       return LEFW_BAD_DATA;
     encPrint(lefwFile,
              (char*) "\n     ADJACENTCUTS %d WITHIN %.11g",
@@ -1088,7 +1088,7 @@ int lefwLayerCutSpacingAdjacent(int viaCuts,  // either 2, 3 or 4, optional
       encPrint(lefwFile, (char*) " EXCEPTSAMEPGNET");
 
   } else {
-    if (viaCuts < 2 && viaCuts > 4)
+    if (viaCuts < 2 || viaCuts > 4)
       return LEFW_BAD_DATA;
     fprintf(lefwFile, "\n     ADJACENTCUTS %d WITHIN %.11g", viaCuts, distance);
     if (except)
diff --git a/src/odb/src/lef/lef/lex.h b/src/odb/src/lef/lef/lex.h
index e25f8e4524a..85ee2348b33 100644
--- a/src/odb/src/lef/lef/lex.h
+++ b/src/odb/src/lef/lef/lex.h
@@ -30,6 +30,8 @@
 #ifndef leh_h
 #define leh_h
 
+#include <cstddef>
+
 #include "lefiKRDefs.hpp"
 
 BEGIN_LEFDEF_PARSER_NAMESPACE
diff --git a/src/odb/src/lef/lefdiff/diffLefRW.cpp b/src/odb/src/lef/lefdiff/diffLefRW.cpp
index 4e03a8ccf15..ecca65f57af 100644
--- a/src/odb/src/lef/lefdiff/diffLefRW.cpp
+++ b/src/odb/src/lef/lefdiff/diffLefRW.cpp
@@ -2522,9 +2522,6 @@ int viaRuleCB(lefrCallbackType_e c, lefiViaRule* viaRule, lefiUserData ud)
 
 int diffLefReadFile(char* inFile, char* outFile)
 {
-  FILE* f;
-  int res;
-
   userData = (void*) 0x01020304;
   lefrInit();
 
@@ -2572,6 +2569,7 @@ int diffLefReadFile(char* inFile, char* outFile)
   lefrSetViaCbk(viaCB);
   lefrSetViaRuleCbk(viaRuleCB);
 
+  FILE* f;
   if ((f = fopen(inFile, "r")) == nullptr) {
     fprintf(stderr, "Couldn't open input file '%s'\n", inFile);
     return (2);
@@ -2583,10 +2581,10 @@ int diffLefReadFile(char* inFile, char* outFile)
     return (2);
   }
 
-  res = lefrRead(f, inFile, userData);
+  const int res = lefrRead(f, inFile, userData);
 
   fclose(f);
   fclose(fout);
 
-  return 0;
+  return res;
 }
diff --git a/src/odb/src/lef/lefrw/lefrw.cpp b/src/odb/src/lef/lefrw/lefrw.cpp
index 3825f3a1ee6..9922ca376a3 100644
--- a/src/odb/src/lef/lefrw/lefrw.cpp
+++ b/src/odb/src/lef/lefrw/lefrw.cpp
@@ -2549,7 +2549,6 @@ int main(int argc, char** argv)
   int ccr749853 = 0;
   int ccr1688946 = 0;
   int ccr1709089 = 0;
-  int verbose = 0;
 
   // start_mem = (long)sbrk(0);
 
@@ -2813,7 +2812,6 @@ int main(int argc, char** argv)
     // 2nd will enable 2007 by calling lefrEnableParserMsgs
     // 3rd enable all msgs by call lefrEnableAllMsgs
 
-    int nMsgs = 3;
     int dMsgs[3];
     if (numInFile != 1) {
       fprintf(stderr, "Test 2 mode needs only 1 file\n");
diff --git a/src/rcx/src/box.h b/src/rcx/src/box.h
index a6dd1a584ff..a6bd473a222 100644
--- a/src/rcx/src/box.h
+++ b/src/rcx/src/box.h
@@ -57,7 +57,7 @@ class Ath__box
   int _ylo;
   int _xhi;
   int _yhi;
-  Ath__box* _next;
+  Ath__box* _next{nullptr};
 
  public:
   Ath__box();
diff --git a/src/rcx/src/dbUtil.cpp b/src/rcx/src/dbUtil.cpp
index 100c59c53f2..78056cf604e 100644
--- a/src/rcx/src/dbUtil.cpp
+++ b/src/rcx/src/dbUtil.cpp
@@ -482,7 +482,6 @@ dbNet* dbCreateNetUtil::createNetSingleWire(Rect& r,
   if (_currentNet == nullptr) {
     sprintf(netName, "N%d", netId);
 
-    dbShape s;
     dbNet* newNet = createNetSingleWire(netName,
                                         r.xMin(),
                                         r.yMin(),
diff --git a/src/rcx/src/grids.cpp b/src/rcx/src/grids.cpp
index 6c046374a22..2b85f40efce 100644
--- a/src/rcx/src/grids.cpp
+++ b/src/rcx/src/grids.cpp
@@ -39,6 +39,7 @@ namespace rcx {
 Ath__box::Ath__box()
 {
   set(0, 0, 0, 0);
+  _layer = 0;
 }
 int Ath__box::getXlo(int bound)
 {
diff --git a/src/utl/include/utl/algorithms.h b/src/utl/include/utl/algorithms.h
index a5ee5b9f097..a6785389a13 100644
--- a/src/utl/include/utl/algorithms.h
+++ b/src/utl/include/utl/algorithms.h
@@ -37,6 +37,7 @@
 
 #include <boost/generator_iterator.hpp>
 #include <boost/random.hpp>
+#include <iomanip>
 #include <sstream>
 #include <tuple>