diff --git a/liberty/Liberty.i b/liberty/Liberty.i
index a87cd799..f0a9bc09 100644
--- a/liberty/Liberty.i
+++ b/liberty/Liberty.i
@@ -25,6 +25,7 @@
 %module liberty
 
 %{
+#include "PatternMatch.hh"
 #include "PortDirection.hh"
 #include "Liberty.hh"
 #include "EquivCells.hh"
diff --git a/search/Search.i b/search/Search.i
index fe836156..f1617670 100644
--- a/search/Search.i
+++ b/search/Search.i
@@ -35,6 +35,7 @@
 #include "Search.hh"
 #include "search/Levelize.hh"
 #include "search/ReportPath.hh"
+#include "search/Tag.hh"
 #include "PathExpanded.hh"
 #include "Bfs.hh"
 #include "Scene.hh"
diff --git a/tcl/StaTclTypes.i b/tcl/StaTclTypes.i
index 5f2430e1..9157a3fc 100644
--- a/tcl/StaTclTypes.i
+++ b/tcl/StaTclTypes.i
@@ -23,24 +23,23 @@
 // This notice may not be removed or altered from any source distribution.
 
 // Swig TCL input/output type parsers.
+
+#if SWIG_VERSION >= 0x040200
+%include "std_string_view.i"
+#endif
+
 %{
 
-#include "Machine.hh"
-#include "StringUtil.hh"
-#include "PatternMatch.hh"
 #include "Network.hh"
 #include "Liberty.hh"
 #include "FuncExpr.hh"
 #include "TimingArc.hh"
-#include "TableModel.hh"
 #include "TimingRole.hh"
 #include "Graph.hh"
-#include "NetworkClass.hh"
 #include "Clock.hh"
 #include "Scene.hh"
 #include "Search.hh"
 #include "Path.hh"
-#include "search/Tag.hh"
 #include "PathEnd.hh"
 #include "SearchClass.hh"
 #include "CircuitSim.hh"