6 files changed, 15 insertions, 15 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h
index 9f04902b..09be93e0 100644
--- a/src/map/if/if.h
+++ b/src/map/if/if.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __IF_H__
-#define __IF_H__
+#ifndef ABC__map__if__if_h
+#define ABC__map__if__if_h
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -31,9 +31,9 @@
 #include <string.h>
 #include <assert.h>
 #include <time.h>
-#include "vec.h"
-#include "mem.h"
-#include "tim.h"
+#include "src/misc/vec/vec.h"
+#include "src/misc/mem/mem.h"
+#include "src/misc/tim/tim.h"
 
 
 
diff --git a/src/map/if/ifDec07.c b/src/map/if/ifDec07.c
index 41949a2f..074ac6ef 100644
--- a/src/map/if/ifDec07.c
+++ b/src/map/if/ifDec07.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "if.h"
-#include "extra.h"
-#include "kit.h"
+#include "src/misc/extra/extra.h"
+#include "src/bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/if/ifDec08.c b/src/map/if/ifDec08.c
index 06081414..54eff63e 100644
--- a/src/map/if/ifDec08.c
+++ b/src/map/if/ifDec08.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "if.h"
-#include "extra.h"
-#include "kit.h"
+#include "src/misc/extra/extra.h"
+#include "src/bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/if/ifDec10.c b/src/map/if/ifDec10.c
index 9280e193..01aa32ae 100644
--- a/src/map/if/ifDec10.c
+++ b/src/map/if/ifDec10.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "if.h"
-#include "extra.h"
-#include "kit.h"
+#include "src/misc/extra/extra.h"
+#include "src/bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c
index 5972c2ea..c1e87aaa 100644
--- a/src/map/if/ifDec16.c
+++ b/src/map/if/ifDec16.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "if.h"
-#include "kit.h"
+#include "src/bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/if/ifTime.c b/src/map/if/ifTime.c
index b901a363..b5e2a3d0 100644
--- a/src/map/if/ifTime.c
+++ b/src/map/if/ifTime.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "if.h"
-#include "kit.h"
+#include "src/bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -143,7 +143,7 @@ If_And_t If_CutDelaySopCube( Vec_Wrd_t * vCube, Vec_Wrd_t * vAnds, int fOrGate )
         Next.fCompl1 = This.fCompl ^ fOrGate;
         Next.Id      = Vec_WrdSize(vAnds);
         Next.fCompl  = fOrGate;
-        Next.Delay   = 1 + ABC_MAX( This.Delay, Prev.Delay );
+        Next.Delay   = 1 + Abc_MaxInt( This.Delay, Prev.Delay );
         // add new
         If_AndInsertSorted( vCube, Next );
         Vec_WrdPush( vAnds, If_AndToWrd(Next) );
@@ -313,7 +313,7 @@ int If_CutDelayLeafDepth_rec( Vec_Wrd_t * vAnds, If_And_t And, int iLeaf )
         return -IF_BIG_CHAR;
     Depth0 = If_CutDelayLeafDepth_rec( vAnds, If_WrdToAnd(Vec_WrdEntry(vAnds, And.iFan0)), iLeaf );
     Depth1 = If_CutDelayLeafDepth_rec( vAnds, If_WrdToAnd(Vec_WrdEntry(vAnds, And.iFan1)), iLeaf );
-    Depth  = ABC_MAX( Depth0, Depth1 );
+    Depth  = Abc_MaxInt( Depth0, Depth1 );
     Depth  = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1;
     return Depth;
 }