Updating project settings to have simpler include paths.

70 files changed, 133 insertions, 133 deletions

diff --git a/src/aig/aig/aig.h b/src/aig/aig/aig.h
index adad1837..3e682391 100644
--- a/src/aig/aig/aig.h
+++ b/src/aig/aig/aig.h
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/vec/vec.h"
-#include "src/misc/util/utilCex.h"
+#include "misc/vec/vec.h"
+#include "misc/util/utilCex.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/aig/aig/aigCanon.c b/src/aig/aig/aigCanon.c
index f312c996..e13e88fd 100644
--- a/src/aig/aig/aigCanon.c
+++ b/src/aig/aig/aigCanon.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/bool/kit/kit.h"
-#include "src/bool/bdc/bdc.h"
-#include "src/aig/ioa/ioa.h"
+#include "bool/kit/kit.h"
+#include "bool/bdc/bdc.h"
+#include "aig/ioa/ioa.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigCuts.c b/src/aig/aig/aigCuts.c
index 5e3bb93a..da20c4d9 100644
--- a/src/aig/aig/aigCuts.c
+++ b/src/aig/aig/aigCuts.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/bool/kit/kit.h"
+#include "bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigDfs.c b/src/aig/aig/aigDfs.c
index b4b7862e..c55cbedd 100644
--- a/src/aig/aig/aigDfs.c
+++ b/src/aig/aig/aigDfs.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/misc/tim/tim.h"
+#include "misc/tim/tim.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigDoms.c b/src/aig/aig/aigDoms.c
index fe9403b5..a537e2ab 100644
--- a/src/aig/aig/aigDoms.c
+++ b/src/aig/aig/aigDoms.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/aig/saig/saig.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigDup.c b/src/aig/aig/aigDup.c
index 97d99128..b4c61d15 100644
--- a/src/aig/aig/aigDup.c
+++ b/src/aig/aig/aigDup.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/aig/saig/saig.h"
-#include "src/misc/tim/tim.h"
+#include "aig/saig/saig.h"
+#include "misc/tim/tim.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigFact.c b/src/aig/aig/aigFact.c
index 33e07161..196cea71 100644
--- a/src/aig/aig/aigFact.c
+++ b/src/aig/aig/aigFact.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/bool/kit/kit.h"
+#include "bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigInter.c b/src/aig/aig/aigInter.c
index f4901c79..636cb494 100644
--- a/src/aig/aig/aigInter.c
+++ b/src/aig/aig/aigInter.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satStore.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satStore.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigMan.c b/src/aig/aig/aigMan.c
index a7bd17da..6a0555a0 100644
--- a/src/aig/aig/aigMan.c
+++ b/src/aig/aig/aigMan.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/misc/tim/tim.h"
+#include "misc/tim/tim.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigPart.c b/src/aig/aig/aigPart.c
index fdbba36a..4ca12041 100644
--- a/src/aig/aig/aigPart.c
+++ b/src/aig/aig/aigPart.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/misc/tim/tim.h"
-#include "src/proof/fra/fra.h"
+#include "misc/tim/tim.h"
+#include "proof/fra/fra.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigPartSat.c b/src/aig/aig/aigPartSat.c
index d187a19b..ec6a6d73 100644
--- a/src/aig/aig/aigPartSat.c
+++ b/src/aig/aig/aigPartSat.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigRepar.c b/src/aig/aig/aigRepar.c
index 7f9699fd..210c527e 100644
--- a/src/aig/aig/aigRepar.c
+++ b/src/aig/aig/aigRepar.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver2.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver2.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigSplit.c b/src/aig/aig/aigSplit.c
index 50f96a81..5c6b833c 100644
--- a/src/aig/aig/aigSplit.c
+++ b/src/aig/aig/aigSplit.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/aig/saig/saig.h"
-#include "src/misc/extra/extraBdd.h"
+#include "aig/saig/saig.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigTsim.c b/src/aig/aig/aigTsim.c
index 36dc28dd..dd9eb6e7 100644
--- a/src/aig/aig/aigTsim.c
+++ b/src/aig/aig/aigTsim.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "aig.h"
-#include "src/aig/saig/saig.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/aig/aigUtil.c b/src/aig/aig/aigUtil.c
index 0cf12370..4d1a8912 100644
--- a/src/aig/aig/aigUtil.c
+++ b/src/aig/aig/aigUtil.c
@@ -1288,8 +1288,8 @@ void Aig_NodeIntersectLists( Vec_Ptr_t * vArr1, Vec_Ptr_t * vArr2, Vec_Ptr_t * v
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/proof/fra/fra.h"
-#include "src/aig/saig/saig.h"
+#include "proof/fra/fra.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h
index 0d97dd61..f427b670 100644
--- a/src/aig/gia/gia.h
+++ b/src/aig/gia/gia.h
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/vec/vec.h"
-#include "src/misc/util/utilCex.h"
+#include "misc/vec/vec.h"
+#include "misc/util/utilCex.h"
 #include "giaAbs.h"
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/aig/gia/giaAbs.c b/src/aig/gia/giaAbs.c
index 548eec74..9e37c5ed 100644
--- a/src/aig/gia/giaAbs.c
+++ b/src/aig/gia/giaAbs.c
@@ -20,7 +20,7 @@
  
 #include "gia.h"
 #include "giaAig.h"
-#include "src/aig/saig/saig.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaAbsGla.c b/src/aig/gia/giaAbsGla.c
index 0cd0b300..9576ea38 100644
--- a/src/aig/gia/giaAbsGla.c
+++ b/src/aig/gia/giaAbsGla.c
@@ -20,10 +20,10 @@
 
 #include "gia.h"
 #include "giaAig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver2.h"
-#include "src/base/main/main.h"
-#include "src/aig/saig/saig.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver2.h"
+#include "base/main/main.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaAbsVta.c b/src/aig/gia/giaAbsVta.c
index 59bcbb32..50692670 100644
--- a/src/aig/gia/giaAbsVta.c
+++ b/src/aig/gia/giaAbsVta.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/sat/bsat/satSolver2.h"
-#include "src/base/main/main.h"
+#include "sat/bsat/satSolver2.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaAig.c b/src/aig/gia/giaAig.c
index f8fce6f6..4099fe54 100644
--- a/src/aig/gia/giaAig.c
+++ b/src/aig/gia/giaAig.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "giaAig.h"
-#include "src/proof/fra/fra.h"
-#include "src/proof/dch/dch.h"
-#include "src/opt/dar/dar.h"
+#include "proof/fra/fra.h"
+#include "proof/dch/dch.h"
+#include "opt/dar/dar.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaAig.h b/src/aig/gia/giaAig.h
index 6522a5bc..adcf9097 100644
--- a/src/aig/gia/giaAig.h
+++ b/src/aig/gia/giaAig.h
@@ -26,7 +26,7 @@
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "src/aig/aig/aig.h"
+#include "aig/aig/aig.h"
 #include "gia.h"
 
 ABC_NAMESPACE_HEADER_START
diff --git a/src/aig/gia/giaBidec.c b/src/aig/gia/giaBidec.c
index 19277f12..802c2bdc 100644
--- a/src/aig/gia/giaBidec.c
+++ b/src/aig/gia/giaBidec.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/bool/bdc/bdc.h"
+#include "bool/bdc/bdc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaCCof.c b/src/aig/gia/giaCCof.c
index ce863051..fd704635 100644
--- a/src/aig/gia/giaCCof.c
+++ b/src/aig/gia/giaCCof.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaEmbed.c b/src/aig/gia/giaEmbed.c
index 79a1acf4..871def74 100644
--- a/src/aig/gia/giaEmbed.c
+++ b/src/aig/gia/giaEmbed.c
@@ -20,7 +20,7 @@
 
 #include <math.h>
 #include "gia.h"
-#include "src/aig/ioa/ioa.h"
+#include "aig/ioa/ioa.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c
index 492f55ef..28e4901e 100644
--- a/src/aig/gia/giaEquiv.c
+++ b/src/aig/gia/giaEquiv.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/proof/cec/cec.h"
+#include "proof/cec/cec.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -1654,9 +1654,9 @@ int Gia_ManCountChoices( Gia_Man_t * p )
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/aig/aig/aig.h"
-#include "src/aig/saig/saig.h"
-#include "src/proof/cec/cec.h"
+#include "aig/aig/aig.h"
+#include "aig/saig/saig.h"
+#include "proof/cec/cec.h"
 #include "giaAig.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/aig/gia/giaEra.c b/src/aig/gia/giaEra.c
index 03832e4a..335a1299 100644
--- a/src/aig/gia/giaEra.c
+++ b/src/aig/gia/giaEra.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/misc/mem/mem.h"
+#include "misc/mem/mem.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaEra2.c b/src/aig/gia/giaEra2.c
index f5f9fdb3..a05411fb 100644
--- a/src/aig/gia/giaEra2.c
+++ b/src/aig/gia/giaEra2.c
@@ -1772,8 +1772,8 @@ int Gia_ManArePerform( Gia_Man_t * pAig, int nStatesMax, int fMiter, int fVerbos
 ABC_NAMESPACE_IMPL_END
 
 #include "giaAig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaGiarf.c b/src/aig/gia/giaGiarf.c
index 1e2d1d18..e472a48e 100644
--- a/src/aig/gia/giaGiarf.c
+++ b/src/aig/gia/giaGiarf.c
@@ -737,7 +737,7 @@ void Gia_GiarfPrintClasses( Gia_Man_t * pGia )
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/proof/cec/cecInt.h"
+#include "proof/cec/cecInt.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaHcd.c b/src/aig/gia/giaHcd.c
index 656c880a..4e766c5b 100644
--- a/src/aig/gia/giaHcd.c
+++ b/src/aig/gia/giaHcd.c
@@ -20,8 +20,8 @@
 
 #include "gia.h"
 #include "giaAig.h"
-#include "src/aig/aig/aig.h"
-#include "src/opt/dar/dar.h"
+#include "aig/aig/aig.h"
+#include "opt/dar/dar.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c
index 2ae7dab8..b4e4c565 100644
--- a/src/aig/gia/giaIf.c
+++ b/src/aig/gia/giaIf.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/aig/aig/aig.h"
-#include "src/map/if/if.h"
-#include "src/opt/dar/dar.h"
+#include "aig/aig/aig.h"
+#include "map/if/if.h"
+#include "opt/dar/dar.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c
index d610882c..60337988 100644
--- a/src/aig/gia/giaMan.c
+++ b/src/aig/gia/giaMan.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/misc/tim/tim.h"
+#include "misc/tim/tim.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaReparam.c b/src/aig/gia/giaReparam.c
index edaacdac..74f99df7 100644
--- a/src/aig/gia/giaReparam.c
+++ b/src/aig/gia/giaReparam.c
@@ -20,7 +20,7 @@
 
 #include "gia.h"
 #include "giaAig.h"
-#include "src/aig/saig/saig.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaShrink.c b/src/aig/gia/giaShrink.c
index 2db815fc..3d8c9e50 100644
--- a/src/aig/gia/giaShrink.c
+++ b/src/aig/gia/giaShrink.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/aig/aig/aig.h"
-#include "src/opt/dar/dar.h"
+#include "aig/aig/aig.h"
+#include "opt/dar/dar.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaSpeedup.c b/src/aig/gia/giaSpeedup.c
index 1098771e..be9a8654 100644
--- a/src/aig/gia/giaSpeedup.c
+++ b/src/aig/gia/giaSpeedup.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/map/if/if.h"
+#include "map/if/if.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaSupMin.c b/src/aig/gia/giaSupMin.c
index 90c30c71..248587a0 100644
--- a/src/aig/gia/giaSupMin.c
+++ b/src/aig/gia/giaSupMin.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "gia.h"
-#include "src/bool/kit/kit.h"
+#include "bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/gia/giaSwitch.c b/src/aig/gia/giaSwitch.c
index d1440ae0..73dff345 100644
--- a/src/aig/gia/giaSwitch.c
+++ b/src/aig/gia/giaSwitch.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "giaAig.h"
-#include "src/base/main/main.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/hop/hop.h b/src/aig/hop/hop.h
index d23f3508..2d25b002 100644
--- a/src/aig/hop/hop.h
+++ b/src/aig/hop/hop.h
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/vec/vec.h"
+#include "misc/vec/vec.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/aig/ioa/ioa.h b/src/aig/ioa/ioa.h
index 809e8e3f..c8aebd39 100644
--- a/src/aig/ioa/ioa.h
+++ b/src/aig/ioa/ioa.h
@@ -31,9 +31,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/vec/vec.h"
+#include "misc/vec/vec.h"
 //#include "bar.h"
-#include "src/aig/aig/aig.h"
+#include "aig/aig/aig.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/aig/ivy/ivy.h b/src/aig/ivy/ivy.h
index f0292e6c..1cce1217 100644
--- a/src/aig/ivy/ivy.h
+++ b/src/aig/ivy/ivy.h
@@ -27,8 +27,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
-#include "src/misc/extra/extra.h"
-#include "src/misc/vec/vec.h"
+#include "misc/extra/extra.h"
+#include "misc/vec/vec.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/aig/ivy/ivyFraig.c b/src/aig/ivy/ivyFraig.c
index 411402fb..d4cbd57a 100644
--- a/src/aig/ivy/ivyFraig.c
+++ b/src/aig/ivy/ivyFraig.c
@@ -20,8 +20,8 @@
 
 #include <math.h>
 
-#include "src/sat/bsat/satSolver.h"
-#include "src/misc/extra/extra.h"
+#include "sat/bsat/satSolver.h"
+#include "misc/extra/extra.h"
 #include "ivy.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -2659,7 +2659,7 @@ p->timeTrav += clock() - clk;
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/bdd/cudd/cuddInt.h"
+#include "bdd/cudd/cuddInt.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -2817,7 +2817,7 @@ int Ivy_FraigNodesAreEquivBdd( Ivy_Obj_t * pObj1, Ivy_Obj_t * pObj2 )
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/aig/aig/aig.h"
+#include "aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/ivy/ivyRwr.c b/src/aig/ivy/ivyRwr.c
index 292bd3f9..2e3689c1 100644
--- a/src/aig/ivy/ivyRwr.c
+++ b/src/aig/ivy/ivyRwr.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ivy.h"
-#include "src/bool/deco/deco.h"
-#include "src/opt/rwt/rwt.h"
+#include "bool/deco/deco.h"
+#include "opt/rwt/rwt.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/ivy/ivySeq.c b/src/aig/ivy/ivySeq.c
index 4a999780..c905fa62 100644
--- a/src/aig/ivy/ivySeq.c
+++ b/src/aig/ivy/ivySeq.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ivy.h"
-#include "src/bool/deco/deco.h"
-#include "src/opt/rwt/rwt.h"
+#include "bool/deco/deco.h"
+#include "opt/rwt/rwt.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saig.h b/src/aig/saig/saig.h
index 8752082f..ec33b3eb 100644
--- a/src/aig/saig/saig.h
+++ b/src/aig/saig/saig.h
@@ -26,8 +26,8 @@
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "src/aig/aig/aig.h"
-#include "src/aig/gia/giaAbs.h"
+#include "aig/aig/aig.h"
+#include "aig/gia/giaAbs.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/aig/saig/saigAbsCba.c b/src/aig/saig/saigAbsCba.c
index 5a73a4d0..8f2cafaa 100644
--- a/src/aig/saig/saigAbsCba.c
+++ b/src/aig/saig/saigAbsCba.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/aig/gia/giaAig.h"
-#include "src/aig/ioa/ioa.h"
+#include "aig/gia/giaAig.h"
+#include "aig/ioa/ioa.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigAbsPba.c b/src/aig/saig/saigAbsPba.c
index 9a10edb6..34e1decf 100644
--- a/src/aig/saig/saigAbsPba.c
+++ b/src/aig/saig/saigAbsPba.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/aig/gia/giaAig.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "aig/gia/giaAig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigAbsStart.c b/src/aig/saig/saigAbsStart.c
index 77517c18..51033dee 100644
--- a/src/aig/saig/saigAbsStart.c
+++ b/src/aig/saig/saigAbsStart.c
@@ -19,10 +19,10 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/ssw/ssw.h"
-#include "src/proof/fra/fra.h"
-#include "src/proof/bbr/bbr.h"
-#include "src/proof/pdr/pdr.h"
+#include "proof/ssw/ssw.h"
+#include "proof/fra/fra.h"
+#include "proof/bbr/bbr.h"
+#include "proof/pdr/pdr.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigAbsVfa.c b/src/aig/saig/saigAbsVfa.c
index e991ac35..2c3ebbff 100644
--- a/src/aig/saig/saigAbsVfa.c
+++ b/src/aig/saig/saigAbsVfa.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigBmc.c b/src/aig/saig/saigBmc.c
index 021ad5d0..f88d3162 100644
--- a/src/aig/saig/saigBmc.c
+++ b/src/aig/saig/saigBmc.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/fra/fra.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satStore.h"
+#include "proof/fra/fra.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satStore.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -167,7 +167,7 @@ Aig_Man_t * Saig_ManFramesBmcLimit( Aig_Man_t * pAig, int nFrames, int nSizeMax
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/misc/util/utilMem.h"
+#include "misc/util/utilMem.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigBmc2.c b/src/aig/saig/saigBmc2.c
index 8ff9a7a7..92e701a1 100644
--- a/src/aig/saig/saigBmc2.c
+++ b/src/aig/saig/saigBmc2.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satStore.h"
-#include "src/proof/ssw/ssw.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satStore.h"
+#include "proof/ssw/ssw.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigBmc3.c b/src/aig/saig/saigBmc3.c
index 12e982cc..973112b2 100644
--- a/src/aig/saig/saigBmc3.c
+++ b/src/aig/saig/saigBmc3.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/fra/fra.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satStore.h"
+#include "proof/fra/fra.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satStore.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigCexMin.c b/src/aig/saig/saigCexMin.c
index e50ba4c7..f0fca2c4 100644
--- a/src/aig/saig/saigCexMin.c
+++ b/src/aig/saig/saigCexMin.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/aig/ioa/ioa.h"
+#include "aig/ioa/ioa.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigConstr.c b/src/aig/saig/saigConstr.c
index 6b90f2c1..6c258505 100644
--- a/src/aig/saig/saigConstr.c
+++ b/src/aig/saig/saigConstr.c
@@ -19,10 +19,10 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/bool/kit/kit.h"
-#include "src/aig/ioa/ioa.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "bool/kit/kit.h"
+#include "aig/ioa/ioa.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigConstr2.c b/src/aig/saig/saigConstr2.c
index 85e79e3f..1d842b3c 100644
--- a/src/aig/saig/saigConstr2.c
+++ b/src/aig/saig/saigConstr2.c
@@ -19,10 +19,10 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/bool/kit/kit.h"
-#include "src/misc/bar/bar.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "bool/kit/kit.h"
+#include "misc/bar/bar.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigGlaCba.c b/src/aig/saig/saigGlaCba.c
index d39ff944..162795b0 100644
--- a/src/aig/saig/saigGlaCba.c
+++ b/src/aig/saig/saigGlaCba.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigGlaPba.c b/src/aig/saig/saigGlaPba.c
index e039ed75..14f47c5c 100644
--- a/src/aig/saig/saigGlaPba.c
+++ b/src/aig/saig/saigGlaPba.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
  
 #include "saig.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/sat/bsat/satStore.h"
+#include "sat/bsat/satSolver.h"
+#include "sat/bsat/satStore.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigGlaPba2.c b/src/aig/saig/saigGlaPba2.c
index 42850e01..5e745f4c 100644
--- a/src/aig/saig/saigGlaPba2.c
+++ b/src/aig/saig/saigGlaPba2.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
  
 #include "saig.h"
-#include "src/sat/bsat/satSolver2.h"
+#include "sat/bsat/satSolver2.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigHaig.c b/src/aig/saig/saigHaig.c
index d06dc758..7cb34c5d 100644
--- a/src/aig/saig/saigHaig.c
+++ b/src/aig/saig/saigHaig.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigInd.c b/src/aig/saig/saigInd.c
index 39ec734a..f9cccae8 100644
--- a/src/aig/saig/saigInd.c
+++ b/src/aig/saig/saigInd.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigIso.c b/src/aig/saig/saigIso.c
index be97aa74..1c319af7 100644
--- a/src/aig/saig/saigIso.c
+++ b/src/aig/saig/saigIso.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/aig/ioa/ioa.h"
+#include "aig/ioa/ioa.h"
 #include "saig.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -575,7 +575,7 @@ Aig_Man_t * Saig_ManIsoReduce( Aig_Man_t * pAig, Vec_Ptr_t ** pvPosEquivs, int f
 }
 
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 /**Function*************************************************************
 
diff --git a/src/aig/saig/saigMiter.c b/src/aig/saig/saigMiter.c
index f3f6f279..8ebb81dd 100644
--- a/src/aig/saig/saigMiter.c
+++ b/src/aig/saig/saigMiter.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/fra/fra.h"
+#include "proof/fra/fra.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigOutDec.c b/src/aig/saig/saigOutDec.c
index d059a935..13c4ad74 100644
--- a/src/aig/saig/saigOutDec.c
+++ b/src/aig/saig/saigOutDec.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigRefSat.c b/src/aig/saig/saigRefSat.c
index d99320ce..fc03e182 100644
--- a/src/aig/saig/saigRefSat.c
+++ b/src/aig/saig/saigRefSat.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigRetMin.c b/src/aig/saig/saigRetMin.c
index 161fce0a..ff3e45df 100644
--- a/src/aig/saig/saigRetMin.c
+++ b/src/aig/saig/saigRetMin.c
@@ -20,10 +20,10 @@
 
 #include "saig.h"
 
-#include "src/opt/nwk/nwk.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/sat/bsat/satStore.h"
+#include "opt/nwk/nwk.h"
+#include "sat/cnf/cnf.h"
+#include "sat/bsat/satSolver.h"
+#include "sat/bsat/satStore.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigSimExt.c b/src/aig/saig/saigSimExt.c
index 36f3d903..1a5ec7e5 100644
--- a/src/aig/saig/saigSimExt.c
+++ b/src/aig/saig/saigSimExt.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/ssw/ssw.h"
+#include "proof/ssw/ssw.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigSimExt2.c b/src/aig/saig/saigSimExt2.c
index 335c4034..ca46c0b3 100644
--- a/src/aig/saig/saigSimExt2.c
+++ b/src/aig/saig/saigSimExt2.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/ssw/ssw.h"
+#include "proof/ssw/ssw.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigSimFast.c b/src/aig/saig/saigSimFast.c
index e54e58ac..6b669eb9 100644
--- a/src/aig/saig/saigSimFast.c
+++ b/src/aig/saig/saigSimFast.c
@@ -20,7 +20,7 @@
 
 #include "saig.h"
 
-#include "src/base/main/main.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigSimSeq.c b/src/aig/saig/saigSimSeq.c
index ee4085b1..f71b74cb 100644
--- a/src/aig/saig/saigSimSeq.c
+++ b/src/aig/saig/saigSimSeq.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/ssw/ssw.h"
+#include "proof/ssw/ssw.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigStrSim.c b/src/aig/saig/saigStrSim.c
index 2feaba1b..85297abc 100644
--- a/src/aig/saig/saigStrSim.c
+++ b/src/aig/saig/saigStrSim.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/ssw/ssw.h"
+#include "proof/ssw/ssw.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigSwitch.c b/src/aig/saig/saigSwitch.c
index 8f4f962f..b7e6ba8f 100644
--- a/src/aig/saig/saigSwitch.c
+++ b/src/aig/saig/saigSwitch.c
@@ -20,7 +20,7 @@
 
 #include "saig.h"
 
-#include "src/base/main/main.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/aig/saig/saigTrans.c b/src/aig/saig/saigTrans.c
index 55c9772a..5e7b719b 100644
--- a/src/aig/saig/saigTrans.c
+++ b/src/aig/saig/saigTrans.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "saig.h"
-#include "src/proof/fra/fra.h"
+#include "proof/fra/fra.h"
 
 ABC_NAMESPACE_IMPL_START