From 00cee5f2f5c834eb5c726a44e090a7a7991704f5 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Wed, 24 Dec 2025 20:10:08 -0800
Subject: [PATCH] Reordering includes.

---
 src/opt/ufar/UfarCmd.cpp | 10 +++++-----
 src/opt/ufar/UfarMgr.cpp | 20 +++++++++-----------
 src/opt/ufar/UfarPth.cpp | 13 +++++++------
 src/opt/ufar/UfarPth.h   |  2 +-
 src/opt/untk/Netlist.cpp |  5 ++---
 src/opt/untk/NtkNtk.cpp  | 14 +++++++-------
 src/opt/untk/NtkNtk.h    |  1 +
 7 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/opt/ufar/UfarCmd.cpp b/src/opt/ufar/UfarCmd.cpp
index a42a6a536..162105c40 100755
--- a/src/opt/ufar/UfarCmd.cpp
+++ b/src/opt/ufar/UfarCmd.cpp
@@ -5,17 +5,17 @@
  *      Author: Yen-Sheng Ho
  */
 
+#include <iostream>
+#include <iomanip>
+#include <climits>
+#include <regex>
+
 #include "base/wlc/wlc.h"
 #include "opt/ufar/UfarCmd.h"
 #include "opt/ufar/UfarMgr.h"
 #include "opt/untk/NtkNtk.h"
 #include "opt/util/util.h"
 
-#include <iostream>
-#include <iomanip>
-#include <climits>
-#include <regex>
-
 ABC_NAMESPACE_IMPL_START
 
 using namespace std;
diff --git a/src/opt/ufar/UfarMgr.cpp b/src/opt/ufar/UfarMgr.cpp
index d60148054..373e1e322 100755
--- a/src/opt/ufar/UfarMgr.cpp
+++ b/src/opt/ufar/UfarMgr.cpp
@@ -7,17 +7,6 @@
 
 #include <cstdio>
 #include <fstream>
-
-#include "UfarMgr.h"
-#include "opt/untk/NtkNtk.h"
-#include "opt/util/util.h"
-
-#include <base/wlc/wlc.h>
-#include <sat/cnf/cnf.h>
-#include <aig/gia/giaAig.h>
-
-#include <sys/wait.h>
-
 #include <iostream>
 #include <iomanip>
 #include <map>
@@ -25,6 +14,15 @@
 #include <array>
 #include <regex>
 
+#include <sys/wait.h>
+
+#include <base/wlc/wlc.h>
+#include <sat/cnf/cnf.h>
+#include <aig/gia/giaAig.h>
+#include "opt/untk/NtkNtk.h"
+#include "opt/util/util.h"
+#include "UfarMgr.h"
+
 ABC_NAMESPACE_IMPL_START
 
 using namespace std;
diff --git a/src/opt/ufar/UfarPth.cpp b/src/opt/ufar/UfarPth.cpp
index 2a01bcc56..085614275 100755
--- a/src/opt/ufar/UfarPth.cpp
+++ b/src/opt/ufar/UfarPth.cpp
@@ -1,15 +1,16 @@
-#include "UfarPth.h"
-#include "opt/util/util.h"
-#include "opt/untk/NtkNtk.h"
-#include "sat/bmc/bmc.h"
-#include "proof/pdr/pdr.h"
-#include "aig/gia/giaAig.h"
 
 #include "misc/util/abc_namespaces.h"
 
 #include <pthread.h>
 #include <unistd.h>
 
+#include "sat/bmc/bmc.h"
+#include "proof/pdr/pdr.h"
+#include "aig/gia/giaAig.h"
+#include "opt/util/util.h"
+#include "opt/untk/NtkNtk.h"
+#include "UfarPth.h"
+
 ABC_NAMESPACE_IMPL_START
 
 extern "C" {
diff --git a/src/opt/ufar/UfarPth.h b/src/opt/ufar/UfarPth.h
index 029a24d3a..41716ebe9 100755
--- a/src/opt/ufar/UfarPth.h
+++ b/src/opt/ufar/UfarPth.h
@@ -5,9 +5,9 @@
 #ifndef SRC_EXT2_UFAR_PTH_H
 #define SRC_EXT2_UFAR_PTH_H
 
-#include "base/wlc/wlc.h"
 #include <vector>
 #include <string>
+#include "base/wlc/wlc.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 
diff --git a/src/opt/untk/Netlist.cpp b/src/opt/untk/Netlist.cpp
index e06be9661..896bab39a 100755
--- a/src/opt/untk/Netlist.cpp
+++ b/src/opt/untk/Netlist.cpp
@@ -2,11 +2,10 @@
 // Created by Yen-Sheng Ho on 8/9/16.
 //
 
-#include "Netlist.h"
+#include <iostream>
 
 #include <base/wlc/wlc.h>
-
-#include <iostream>
+#include "Netlist.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/untk/NtkNtk.cpp b/src/opt/untk/NtkNtk.cpp
index bd81a362b..64dcd613d 100755
--- a/src/opt/untk/NtkNtk.cpp
+++ b/src/opt/untk/NtkNtk.cpp
@@ -5,10 +5,9 @@
  *      Author: Yen-Sheng Ho
  */
 
-#include "NtkNtk.h"
-#include "Netlist.h"
-#include "opt/util/util.h"
-#include "opt/ufar/UfarPth.h"
+#include <unistd.h>
+#include <sys/wait.h>
+#include <fstream>
 
 #include <base/wlc/wlc.h>
 #include <sat/bmc/bmc.h>
@@ -16,9 +15,10 @@
 #include <proof/fraig/fraig.h>
 #include <aig/gia/giaAig.h>
 
-#include <unistd.h>
-#include <sys/wait.h>
-#include <fstream>
+#include "opt/util/util.h"
+#include "opt/ufar/UfarPth.h"
+#include "NtkNtk.h"
+#include "Netlist.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/untk/NtkNtk.h b/src/opt/untk/NtkNtk.h
index 14103bed9..e3323f123 100755
--- a/src/opt/untk/NtkNtk.h
+++ b/src/opt/untk/NtkNtk.h
@@ -14,6 +14,7 @@
 #include <array>
 #include <sstream>
 #include <algorithm>
+
 #include <base/wlc/wlc.h>
 #include "Netlist.h"