11 files changed, 15 insertions, 25 deletions
diff --git a/src/opt/sim/sim.h b/src/opt/sim/sim.h
index e1a34273..84b2ed51 100644
--- a/src/opt/sim/sim.h
+++ b/src/opt/sim/sim.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#ifndef __SIM_H__
-#define __SIM_H__
+#ifndef ABC__opt__sim__sim_h
+#define ABC__opt__sim__sim_h
 
 
 /*
diff --git a/src/opt/sim/simMan.c b/src/opt/sim/simMan.c
index f3a9650b..9856f484 100644
--- a/src/opt/sim/simMan.c
+++ b/src/opt/sim/simMan.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simSat.c b/src/opt/sim/simSat.c
index 5654c493..5c97055b 100644
--- a/src/opt/sim/simSat.c
+++ b/src/opt/sim/simSat.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simSeq.c b/src/opt/sim/simSeq.c
index fd75ba8d..0efe7378 100644
--- a/src/opt/sim/simSeq.c
+++ b/src/opt/sim/simSeq.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simSupp.c b/src/opt/sim/simSupp.c
index 67ac5efe..a7ceaee7 100644
--- a/src/opt/sim/simSupp.c
+++ b/src/opt/sim/simSupp.c
@@ -18,9 +18,8 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
-#include "fraig.h"
+#include "src/base/abc/abc.h"
+#include "src/proof/fraig/fraig.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -384,7 +383,7 @@ void Sim_UtilAssignFromFifo( Sim_Man_t * p )
             iWordLim = iWord + 1; 
             // set the pattern for all PIs from iBit to iWord + p->nInputs
             iBeg = p->iInput;
-            iEnd = ABC_MIN( iBeg + 32, p->nInputs );
+            iEnd = Abc_MinInt( iBeg + 32, p->nInputs );
 //            for ( i = iBeg; i < iEnd; i++ )
             Abc_NtkForEachCi( p->pNtk, pNode, i )
             {
diff --git a/src/opt/sim/simSwitch.c b/src/opt/sim/simSwitch.c
index a9045ca1..26f8cd51 100644
--- a/src/opt/sim/simSwitch.c
+++ b/src/opt/sim/simSwitch.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simSym.c b/src/opt/sim/simSym.c
index c6b588ac..801d4218 100644
--- a/src/opt/sim/simSym.c
+++ b/src/opt/sim/simSym.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simSymSat.c b/src/opt/sim/simSymSat.c
index dcdff135..2043e2d7 100644
--- a/src/opt/sim/simSymSat.c
+++ b/src/opt/sim/simSymSat.c
@@ -18,10 +18,9 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
+#include "src/proof/fraig/fraig.h"
 #include "sim.h"
-#include "fraig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/sim/simSymSim.c b/src/opt/sim/simSymSim.c
index e1676117..fddf602e 100644
--- a/src/opt/sim/simSymSim.c
+++ b/src/opt/sim/simSymSim.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simSymStr.c b/src/opt/sim/simSymStr.c
index 4d83dc61..b9d58b9f 100644
--- a/src/opt/sim/simSymStr.c
+++ b/src/opt/sim/simSymStr.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/sim/simUtils.c b/src/opt/sim/simUtils.c
index 64814c0e..77597e83 100644
--- a/src/opt/sim/simUtils.c
+++ b/src/opt/sim/simUtils.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "sim.h"
 
 ABC_NAMESPACE_IMPL_START