9 files changed, 13 insertions, 21 deletions
diff --git a/src/opt/rwr/rwr.h b/src/opt/rwr/rwr.h
index ed05d4a3..50ea7998 100644
--- a/src/opt/rwr/rwr.h
+++ b/src/opt/rwr/rwr.h
@@ -18,16 +18,16 @@
 
 ***********************************************************************/
  
-#ifndef __RWR_H__
-#define __RWR_H__
+#ifndef ABC__opt__rwr__rwr_h
+#define ABC__opt__rwr__rwr_h
 
 
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "abc.h"
-#include "cut.h"
+#include "src/base/abc/abc.h"
+#include "src/opt/cut/cut.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/opt/rwr/rwrDec.c b/src/opt/rwr/rwrDec.c
index a280f5f1..c1860a7b 100644
--- a/src/opt/rwr/rwrDec.c
+++ b/src/opt/rwr/rwrDec.c
@@ -18,9 +18,8 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
-#include "dec.h"
+#include "src/bool/dec/dec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/rwr/rwrEva.c b/src/opt/rwr/rwrEva.c
index 5d826da9..83eb8d7b 100644
--- a/src/opt/rwr/rwrEva.c
+++ b/src/opt/rwr/rwrEva.c
@@ -18,10 +18,9 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
-#include "dec.h"
-#include "ivy.h"
+#include "src/bool/dec/dec.h"
+#include "src/aig/ivy/ivy.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -487,7 +486,7 @@ int Rwr_NodeGetDepth_rec( Abc_Obj_t * pObj, Vec_Ptr_t * vLeaves )
             return 0;
     Depth0 = Rwr_NodeGetDepth_rec( Abc_ObjFanin0(pObj), vLeaves );
     Depth1 = Rwr_NodeGetDepth_rec( Abc_ObjFanin1(pObj), vLeaves );
-    return 1 + ABC_MAX( Depth0, Depth1 );
+    return 1 + Abc_MaxInt( Depth0, Depth1 );
 }
 
 
diff --git a/src/opt/rwr/rwrExp.c b/src/opt/rwr/rwrExp.c
index fa75f066..c4664fbf 100644
--- a/src/opt/rwr/rwrExp.c
+++ b/src/opt/rwr/rwrExp.c
@@ -18,7 +18,6 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/rwr/rwrLib.c b/src/opt/rwr/rwrLib.c
index a7c01047..b1aa2ac7 100644
--- a/src/opt/rwr/rwrLib.c
+++ b/src/opt/rwr/rwrLib.c
@@ -18,7 +18,6 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -76,7 +75,7 @@ void Rwr_ManPrecompute( Rwr_Man_t * p )
 //            break;
 
         // compute the level and volume of the new nodes
-        Level  = 1 + ABC_MAX( p0->Level, p1->Level );
+        Level  = 1 + Abc_MaxInt( p0->Level, p1->Level );
         Volume = 1 + Rwr_ManNodeVolume( p, p0, p1 );
         // try four different AND nodes
         Rwr_ManTryNode( p,         p0 ,         p1 , 0, Level, Volume );
diff --git a/src/opt/rwr/rwrMan.c b/src/opt/rwr/rwrMan.c
index 0f32c0da..00273b38 100644
--- a/src/opt/rwr/rwrMan.c
+++ b/src/opt/rwr/rwrMan.c
@@ -18,10 +18,9 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
-#include "main.h"
-#include "dec.h"
+#include "src/base/main/main.h"
+#include "src/bool/dec/dec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/opt/rwr/rwrPrint.c b/src/opt/rwr/rwrPrint.c
index 5574df88..11a084d3 100644
--- a/src/opt/rwr/rwrPrint.c
+++ b/src/opt/rwr/rwrPrint.c
@@ -18,7 +18,6 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/rwr/rwrTemp.c b/src/opt/rwr/rwrTemp.c
index 654e37c1..6a670c3a 100644
--- a/src/opt/rwr/rwrTemp.c
+++ b/src/opt/rwr/rwrTemp.c
@@ -18,7 +18,6 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/opt/rwr/rwrUtil.c b/src/opt/rwr/rwrUtil.c
index 7613691a..1b2e8760 100644
--- a/src/opt/rwr/rwrUtil.c
+++ b/src/opt/rwr/rwrUtil.c
@@ -18,7 +18,6 @@
 
 ***********************************************************************/
 
-#include "extra.h"
 #include "rwr.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -491,7 +490,7 @@ void Rwr_ManLoadFromArray( Rwr_Man_t * p, int fVerbose )
         p0 = (Rwr_Node_t *)p->vForest->pArray[Entry0 >> 1];
         p1 = (Rwr_Node_t *)p->vForest->pArray[Entry1 >> 1];
         // compute the level and volume of the new nodes
-        Level  = 1 + ABC_MAX( p0->Level, p1->Level );
+        Level  = 1 + Abc_MaxInt( p0->Level, p1->Level );
         Volume = 1 + Rwr_ManNodeVolume( p, p0, p1 );
         // set the complemented attributes
         p0 = Rwr_NotCond( p0, (Entry0 & 1) );
@@ -586,7 +585,7 @@ void Rwr_ManLoadFromFile( Rwr_Man_t * p, char * pFileName )
         p0 = (Rwr_Node_t *)p->vForest->pArray[pBuffer[2*i + 0] >> 1];
         p1 = (Rwr_Node_t *)p->vForest->pArray[pBuffer[2*i + 1] >> 1];
         // compute the level and volume of the new nodes
-        Level  = 1 + ABC_MAX( p0->Level, p1->Level );
+        Level  = 1 + Abc_MaxInt( p0->Level, p1->Level );
         Volume = 1 + Rwr_ManNodeVolume( p, p0, p1 );
         // set the complemented attributes
         p0 = Rwr_NotCond( p0, (pBuffer[2*i + 0] & 1) );