11 files changed, 19 insertions, 21 deletions
diff --git a/src/opt/res/res.h b/src/opt/res/res.h
index bd328d54..0a941c59 100644
--- a/src/opt/res/res.h
+++ b/src/opt/res/res.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __RES_H__
-#define __RES_H__
+#ifndef ABC__opt__res__res_h
+#define ABC__opt__res__res_h
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/opt/res/resCore.c b/src/opt/res/resCore.c
index eecdd481..effc7e65 100644
--- a/src/opt/res/resCore.c
+++ b/src/opt/res/resCore.c
@@ -18,10 +18,10 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
-#include "kit.h"
-#include "satStore.h"
+#include "src/bool/kit/kit.h"
+#include "src/sat/bsat/satStore.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/res/resDivs.c b/src/opt/res/resDivs.c
index 6d9ffd9f..f378991d 100644
--- a/src/opt/res/resDivs.c
+++ b/src/opt/res/resDivs.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/res/resFilter.c b/src/opt/res/resFilter.c
index b9d62dd8..188b9dc3 100644
--- a/src/opt/res/resFilter.c
+++ b/src/opt/res/resFilter.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/res/resInt.h b/src/opt/res/resInt.h
index ae238359..cd0cf84b 100644
--- a/src/opt/res/resInt.h
+++ b/src/opt/res/resInt.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __RES_INT_H__
-#define __RES_INT_H__
+#ifndef ABC__opt__res__resInt_h
+#define ABC__opt__res__resInt_h
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/opt/res/resSat.c b/src/opt/res/resSat.c
index 17f3d661..111442b4 100644
--- a/src/opt/res/resSat.c
+++ b/src/opt/res/resSat.c
@@ -18,10 +18,10 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
-#include "hop.h"
-#include "satSolver.h"
+#include "src/aig/hop/hop.h"
+#include "src/sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/res/resSim.c b/src/opt/res/resSim.c
index 740b7d0a..d8faf8bf 100644
--- a/src/opt/res/resSim.c
+++ b/src/opt/res/resSim.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/res/resSim_old.c b/src/opt/res/resSim_old.c
index ebadeec0..a6aced1d 100644
--- a/src/opt/res/resSim_old.c
+++ b/src/opt/res/resSim_old.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "base/abc/abc.h"
 #include "resInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/res/resStrash.c b/src/opt/res/resStrash.c
index 1ee84957..c080a718 100644
--- a/src/opt/res/resStrash.c
+++ b/src/opt/res/resStrash.c
@@ -18,8 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "extra.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/res/resWin.c b/src/opt/res/resWin.c
index e6eeac6a..09176833 100644
--- a/src/opt/res/resWin.c
+++ b/src/opt/res/resWin.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "resInt.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -145,10 +145,10 @@ int Res_WinCollectLeavesAndNodes( Res_Win_t * p )
     // get the lowest leaf level
     p->nLevLeafMin = ABC_INFINITY;
     Vec_PtrForEachEntry( Abc_Obj_t *, p->vLeaves, pObj, k )
-        p->nLevLeafMin = ABC_MIN( p->nLevLeafMin, (int)pObj->Level );
+        p->nLevLeafMin = Abc_MinInt( p->nLevLeafMin, (int)pObj->Level );
 
     // set minimum traversal level
-    p->nLevTravMin = ABC_MAX( ((int)p->pNode->Level) - p->nWinTfiMax - p->nLevTfiMinus, p->nLevLeafMin );
+    p->nLevTravMin = Abc_MaxInt( ((int)p->pNode->Level) - p->nWinTfiMax - p->nLevTfiMinus, p->nLevLeafMin );
     assert( p->nLevTravMin >= 0 );
     return 1;
 }
diff --git a/src/opt/res/res_.c b/src/opt/res/res_.c
index ffbc4946..8d18eeaf 100644
--- a/src/opt/res/res_.c
+++ b/src/opt/res/res_.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "base/abc/abc.h"
 #include "res.h"
 
 ABC_NAMESPACE_IMPL_START