diff --git a/dcalc/DelayCalc.i b/dcalc/DelayCalc.i
index ebffef7b..f70895ee 100644
--- a/dcalc/DelayCalc.i
+++ b/dcalc/DelayCalc.i
@@ -1,7 +1,3 @@
-%module dcalc
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module dcalc
+
+%{
 #include "Sta.hh"
 #include "ArcDelayCalc.hh"
 #include "dcalc/ArcDcalcWaveforms.hh"
diff --git a/liberty/Liberty.i b/liberty/Liberty.i
index 4e791825..0b570efb 100644
--- a/liberty/Liberty.i
+++ b/liberty/Liberty.i
@@ -1,7 +1,3 @@
-%module liberty
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module liberty
+
+%{
 #include "Liberty.hh"
 #include "EquivCells.hh"
 #include "LibertyWriter.hh"
diff --git a/parasitics/Parasitics.i b/parasitics/Parasitics.i
index 64d33e51..14989428 100644
--- a/parasitics/Parasitics.i
+++ b/parasitics/Parasitics.i
@@ -1,7 +1,3 @@
-%module parasitics
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module parasitics
+
+%{
 #include "Sta.hh"
 
 using sta::Sta;
diff --git a/power/Power.i b/power/Power.i
index a99b181e..61f6dd2b 100644
--- a/power/Power.i
+++ b/power/Power.i
@@ -1,7 +1,3 @@
-%module power
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module power
+
+%{
 #include "Sta.hh"
 #include "power/Power.hh"
 #include "power/VcdReader.hh"
diff --git a/sdc/Sdc.i b/sdc/Sdc.i
index d7ddb9de..dcdf2db3 100644
--- a/sdc/Sdc.i
+++ b/sdc/Sdc.i
@@ -1,7 +1,3 @@
-%module sdc
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module sdc
+
+%{
 #include "Sdc.hh"
 #include "Clock.hh"
 #include "PortDelay.hh"
@@ -1279,4 +1278,3 @@ Clock *clock() { return self->clock(); }
 RiseFall *transition() { return self->transition(); }
 float time() { return self->time(); }
 }
-
diff --git a/sdf/Sdf.i b/sdf/Sdf.i
index d2fa8905..8a0971be 100644
--- a/sdf/Sdf.i
+++ b/sdf/Sdf.i
@@ -1,7 +1,3 @@
-%module sdf
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module sdf
+
+%{
 #include "sdf/SdfReader.hh"
 #include "sdf/ReportAnnotation.hh"
 #include "sdf/SdfWriter.hh"
diff --git a/tcl/NetworkEdit.i b/tcl/NetworkEdit.i
index 1b3e6673..7ecfbb58 100644
--- a/tcl/NetworkEdit.i
+++ b/tcl/NetworkEdit.i
@@ -1,7 +1,3 @@
-%module NetworkEdit
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module NetworkEdit
+
+%{
 using sta::Cell;
 using sta::Instance;
 using sta::Net;
diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i
index 2560a048..ed5a9dfd 100644
--- a/tcl/StaTcl.i
+++ b/tcl/StaTcl.i
@@ -1,7 +1,3 @@
-%module sta
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -33,6 +29,9 @@
 //
 ////////////////////////////////////////////////////////////////
 
+%module sta
+
+%{
 #include "Machine.hh"
 #include "StaConfig.hh"  // STA_VERSION
 #include "Stats.hh"
diff --git a/tcl/StaTclTypes.i b/tcl/StaTclTypes.i
index 645226a6..648f7961 100644
--- a/tcl/StaTclTypes.i
+++ b/tcl/StaTclTypes.i
@@ -1,3 +1,19 @@
+// OpenSTA, Static Timing Analyzer
+// Copyright (c) 2024, Parallax Software, Inc.
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 // Swig TCL input/output type parsers.
 %{
 
diff --git a/verilog/Verilog.i b/verilog/Verilog.i
index ac077dba..e250545c 100644
--- a/verilog/Verilog.i
+++ b/verilog/Verilog.i
@@ -1,7 +1,3 @@
-%module verilog
-
-%{
-
 // OpenSTA, Static Timing Analyzer
 // Copyright (c) 2024, Parallax Software, Inc.
 // 
@@ -18,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+%module verilog
+
+%{
 #include "VerilogReader.hh"
 #include "VerilogWriter.hh"
 #include "Sta.hh"