Updating project settings to have simpler include paths.

119 files changed, 355 insertions, 355 deletions

diff --git a/src/base/abc/abc.h b/src/base/abc/abc.h
index cbebf318..00659fd8 100644
--- a/src/base/abc/abc.h
+++ b/src/base/abc/abc.h
@@ -31,14 +31,14 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/vec/vec.h"
-#include "src/aig/hop/hop.h"
-#include "src/misc/st/st.h"
-#include "src/misc/st/stmm.h"
-#include "src/misc/nm/nm.h"
-#include "src/misc/mem/mem.h"
-#include "src/misc/util/utilCex.h"
-#include "src/misc/extra/extra.h"
+#include "misc/vec/vec.h"
+#include "aig/hop/hop.h"
+#include "misc/st/st.h"
+#include "misc/st/stmm.h"
+#include "misc/nm/nm.h"
+#include "misc/mem/mem.h"
+#include "misc/util/utilCex.h"
+#include "misc/extra/extra.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/base/abc/abcBlifMv.c b/src/base/abc/abcBlifMv.c
index 47a4c15e..ab0966a9 100644
--- a/src/base/abc/abcBlifMv.c
+++ b/src/base/abc/abcBlifMv.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcCheck.c b/src/base/abc/abcCheck.c
index a80c4372..bc3399e0 100644
--- a/src/base/abc/abcCheck.c
+++ b/src/base/abc/abcCheck.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/base/main/main.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/main/main.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcFunc.c b/src/base/abc/abcFunc.c
index 86604f39..4280b75f 100644
--- a/src/base/abc/abcFunc.c
+++ b/src/base/abc/abcFunc.c
@@ -19,9 +19,9 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcHieCec.c b/src/base/abc/abcHieCec.c
index 83a332c2..707acc12 100644
--- a/src/base/abc/abcHieCec.c
+++ b/src/base/abc/abcHieCec.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/base/io/ioAbc.h"
-#include "src/aig/gia/gia.h"
+#include "base/io/ioAbc.h"
+#include "aig/gia/gia.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcHieNew.c b/src/base/abc/abcHieNew.c
index fe1496d9..2bdc7f28 100644
--- a/src/base/abc/abcHieNew.c
+++ b/src/base/abc/abcHieNew.c
@@ -23,9 +23,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/vec/vec.h"
-#include "src/misc/util/utilNam.h"
-#include "src/misc/extra/extra.h"
+#include "misc/vec/vec.h"
+#include "misc/util/utilNam.h"
+#include "misc/extra/extra.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -1108,7 +1108,7 @@ Au_Ntk_t * Au_NtkParseCBlif( char * pFileName )
 
 
 #include "abc.h"
-#include "src/aig/gia/gia.h"
+#include "aig/gia/gia.h"
 
 extern Vec_Ptr_t * Abc_NtkDfsBoxes( Abc_Ntk_t * pNtk );
 extern int Abc_NtkDeriveFlatGiaSop( Gia_Man_t * pGia, int * gFanins, char * pSop );
diff --git a/src/base/abc/abcLatch.c b/src/base/abc/abcLatch.c
index 865fb8b9..61cae164 100644
--- a/src/base/abc/abcLatch.c
+++ b/src/base/abc/abcLatch.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -486,7 +486,7 @@ Abc_Ntk_t * Abc_NtkConvertOnehot( Abc_Ntk_t * pNtk )
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/aig/gia/giaAig.h"
+#include "aig/gia/giaAig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcMinBase.c b/src/base/abc/abcMinBase.c
index 2efe404f..f61eb292 100644
--- a/src/base/abc/abcMinBase.c
+++ b/src/base/abc/abcMinBase.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcNetlist.c b/src/base/abc/abcNetlist.c
index f8ff8f0c..4dfb7fe2 100644
--- a/src/base/abc/abcNetlist.c
+++ b/src/base/abc/abcNetlist.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/base/main/main.h"
+#include "base/main/main.h"
 //#include "seq.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/abc/abcNtk.c b/src/base/abc/abcNtk.c
index 30eb0873..d7f14810 100644
--- a/src/base/abc/abcNtk.c
+++ b/src/base/abc/abcNtk.c
@@ -20,10 +20,10 @@
 
 #include "abc.h"
 #include "abcInt.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/aig/gia/gia.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "aig/gia/gia.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcObj.c b/src/base/abc/abcObj.c
index 901ffa31..684e6b65 100644
--- a/src/base/abc/abcObj.c
+++ b/src/base/abc/abcObj.c
@@ -20,9 +20,9 @@
 
 #include "abc.h"
 #include "abcInt.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcShow.c b/src/base/abc/abcShow.c
index 2b7370ae..e1baffa1 100644
--- a/src/base/abc/abcShow.c
+++ b/src/base/abc/abcShow.c
@@ -26,9 +26,9 @@
 
 
 #include "abc.h"
-#include "src/base/main/main.h"
-#include "src/base/io/ioAbc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/main/main.h"
+#include "base/io/ioAbc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abc/abcUtil.c b/src/base/abc/abcUtil.c
index 98fdfbfa..bffbf40e 100644
--- a/src/base/abc/abcUtil.c
+++ b/src/base/abc/abcUtil.c
@@ -19,10 +19,10 @@
 ***********************************************************************/
 
 #include "abc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/bool/dec/dec.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "bool/dec/dec.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 03eb8d21..b3f4d559 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -18,37 +18,37 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/base/main/mainInt.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/opt/fxu/fxu.h"
-#include "src/opt/cut/cut.h"
-#include "src/map/fpga/fpga.h"
-#include "src/map/if/if.h"
-#include "src/opt/sim/sim.h"
-#include "src/opt/res/res.h"
-#include "src/opt/lpk/lpk.h"
-#include "src/aig/gia/giaAig.h"
-#include "src/opt/dar/dar.h"
-#include "src/opt/mfs/mfs.h"
-#include "src/proof/fra/fra.h"
-#include "src/aig/saig/saig.h"
-#include "src/proof/int/int.h"
-#include "src/proof/dch/dch.h"
-#include "src/proof/ssw/ssw.h"
-#include "src/opt/cgt/cgt.h"
-#include "src/bool/kit/kit.h"
-#include "src/map/amap/amap.h"
-#include "src/opt/ret/retInt.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/proof/cec/cec.h"
-#include "src/proof/pdr/pdr.h"
-#include "src/misc/tim/tim.h"
-#include "src/proof/llb/llb.h"
-#include "src/proof/bbr/bbr.h"
-#include "src/map/cov/cov.h"
-#include "src/base/cmd/cmd.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "base/main/mainInt.h"
+#include "proof/fraig/fraig.h"
+#include "opt/fxu/fxu.h"
+#include "opt/cut/cut.h"
+#include "map/fpga/fpga.h"
+#include "map/if/if.h"
+#include "opt/sim/sim.h"
+#include "opt/res/res.h"
+#include "opt/lpk/lpk.h"
+#include "aig/gia/giaAig.h"
+#include "opt/dar/dar.h"
+#include "opt/mfs/mfs.h"
+#include "proof/fra/fra.h"
+#include "aig/saig/saig.h"
+#include "proof/int/int.h"
+#include "proof/dch/dch.h"
+#include "proof/ssw/ssw.h"
+#include "opt/cgt/cgt.h"
+#include "bool/kit/kit.h"
+#include "map/amap/amap.h"
+#include "opt/ret/retInt.h"
+#include "sat/cnf/cnf.h"
+#include "proof/cec/cec.h"
+#include "proof/pdr/pdr.h"
+#include "misc/tim/tim.h"
+#include "proof/llb/llb.h"
+#include "proof/bbr/bbr.h"
+#include "map/cov/cov.h"
+#include "base/cmd/cmd.h"
 
 #ifdef _WIN32
 //#include <io.h>
diff --git a/src/base/abci/abcAttach.c b/src/base/abci/abcAttach.c
index 6408b54f..ad435d6d 100644
--- a/src/base/abci/abcAttach.c
+++ b/src/base/abci/abcAttach.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcAuto.c b/src/base/abci/abcAuto.c
index 7b4d7694..3d723b1c 100644
--- a/src/base/abci/abcAuto.c
+++ b/src/base/abci/abcAuto.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcBalance.c b/src/base/abci/abcBalance.c
index 8317558d..2c391e89 100644
--- a/src/base/abci/abcBalance.c
+++ b/src/base/abci/abcBalance.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcBidec.c b/src/base/abci/abcBidec.c
index 507b7355..22564195 100644
--- a/src/base/abci/abcBidec.c
+++ b/src/base/abci/abcBidec.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/bdc/bdc.h"
-#include "src/bool/kit/kit.h"
+#include "base/abc/abc.h"
+#include "bool/bdc/bdc.h"
+#include "bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcBm.c b/src/base/abci/abcBm.c
index 19c8e9ff..741c6a9e 100644
--- a/src/base/abci/abcBm.c
+++ b/src/base/abci/abcBm.c
@@ -27,10 +27,10 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/opt/sim/sim.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "opt/sim/sim.h"
+#include "sat/bsat/satSolver.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcBmc.c b/src/base/abci/abcBmc.c
index 6ea4435c..ec04df51 100644
--- a/src/base/abci/abcBmc.c
+++ b/src/base/abci/abcBmc.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/ivy/ivy.h"
+#include "base/abc/abc.h"
+#include "aig/ivy/ivy.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcCas.c b/src/base/abci/abcCas.c
index 51ab4130..f9fae27f 100644
--- a/src/base/abci/abcCas.c
+++ b/src/base/abci/abcCas.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcCascade.c b/src/base/abci/abcCascade.c
index 60f7294f..bb6e1d4b 100644
--- a/src/base/abci/abcCascade.c
+++ b/src/base/abci/abcCascade.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bdd/reo/reo.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "bdd/reo/reo.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcCollapse.c b/src/base/abci/abcCollapse.c
index e6a6db79..6d3fbbce 100644
--- a/src/base/abci/abcCollapse.c
+++ b/src/base/abci/abcCollapse.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcCut.c b/src/base/abci/abcCut.c
index 918ee2ab..bf64ce99 100644
--- a/src/base/abci/abcCut.c
+++ b/src/base/abci/abcCut.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/opt/cut/cut.h"
+#include "base/abc/abc.h"
+#include "opt/cut/cut.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c
index 82b3d916..bd299425 100644
--- a/src/base/abci/abcDar.c
+++ b/src/base/abci/abcDar.c
@@ -18,22 +18,22 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/aig/gia/giaAig.h"
-#include "src/opt/dar/dar.h"
-#include "src/sat/cnf/cnf.h"
-#include "src/proof/fra/fra.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/proof/int/int.h"
-#include "src/proof/dch/dch.h"
-#include "src/proof/ssw/ssw.h"
-#include "src/opt/cgt/cgt.h"
-#include "src/proof/bbr/bbr.h"
-#include "src/aig/gia/gia.h"
-#include "src/proof/cec/cec.h"
-#include "src/opt/csw/csw.h"
-#include "src/proof/pdr/pdr.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "aig/gia/giaAig.h"
+#include "opt/dar/dar.h"
+#include "sat/cnf/cnf.h"
+#include "proof/fra/fra.h"
+#include "proof/fraig/fraig.h"
+#include "proof/int/int.h"
+#include "proof/dch/dch.h"
+#include "proof/ssw/ssw.h"
+#include "opt/cgt/cgt.h"
+#include "proof/bbr/bbr.h"
+#include "aig/gia/gia.h"
+#include "proof/cec/cec.h"
+#include "opt/csw/csw.h"
+#include "proof/pdr/pdr.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -1833,7 +1833,7 @@ Abc_Ntk_t * Abc_NtkDarLcorrNew( Abc_Ntk_t * pNtk, int nVarsMax, int nConfMax, in
 
 /*
 #include <signal.h>
-#include "src/misc/util/utilMem.h"
+#include "misc/util/utilMem.h"
 static void sigfunc( int signo ) 
 {
     if (signo == SIGINT) {
@@ -3991,8 +3991,8 @@ int Abc_NtkDarReach( Abc_Ntk_t * pNtk, Saig_ParBbr_t * pPars )
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/map/amap/amap.h"
-#include "src/map/mio/mio.h"
+#include "map/amap/amap.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcDebug.c b/src/base/abci/abcDebug.c
index ebed2efa..7dae346c 100644
--- a/src/base/abci/abcDebug.c
+++ b/src/base/abci/abcDebug.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/io/ioAbc.h"
+#include "base/abc/abc.h"
+#include "base/io/ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcDress.c b/src/base/abci/abcDress.c
index 745dcac0..2a453b63 100644
--- a/src/base/abci/abcDress.c
+++ b/src/base/abci/abcDress.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/io/ioAbc.h"
+#include "base/abc/abc.h"
+#include "base/io/ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcDress2.c b/src/base/abci/abcDress2.c
index 84bf1229..9f8cc568 100644
--- a/src/base/abci/abcDress2.c
+++ b/src/base/abci/abcDress2.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/aig/aig.h"
-#include "src/proof/dch/dch.h"
+#include "base/abc/abc.h"
+#include "aig/aig/aig.h"
+#include "proof/dch/dch.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcDsd.c b/src/base/abci/abcDsd.c
index c4086ce7..24496145 100644
--- a/src/base/abci/abcDsd.c
+++ b/src/base/abci/abcDsd.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
-#include "src/bdd/dsd/dsd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
+#include "bdd/dsd/dsd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcExtract.c b/src/base/abci/abcExtract.c
index e718c8ce..1b247841 100644
--- a/src/base/abci/abcExtract.c
+++ b/src/base/abci/abcExtract.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcFpga.c b/src/base/abci/abcFpga.c
index 4d6b2978..965bd5f8 100644
--- a/src/base/abci/abcFpga.c
+++ b/src/base/abci/abcFpga.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/map/fpga/fpgaInt.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "map/fpga/fpgaInt.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcFpgaFast.c b/src/base/abci/abcFpgaFast.c
index 1c5693fd..21399f3d 100644
--- a/src/base/abci/abcFpgaFast.c
+++ b/src/base/abci/abcFpgaFast.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/ivy/ivy.h"
+#include "base/abc/abc.h"
+#include "aig/ivy/ivy.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcFraig.c b/src/base/abci/abcFraig.c
index 23004df2..60b8d662 100644
--- a/src/base/abci/abcFraig.c
+++ b/src/base/abci/abcFraig.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/base/main/main.h"
+#include "base/abc/abc.h"
+#include "proof/fraig/fraig.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcFxu.c b/src/base/abci/abcFxu.c
index 2470a1d1..9cf2e31a 100644
--- a/src/base/abci/abcFxu.c
+++ b/src/base/abci/abcFxu.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/opt/fxu/fxu.h"
+#include "base/abc/abc.h"
+#include "opt/fxu/fxu.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcGen.c b/src/base/abci/abcGen.c
index 4f3ef5bc..fb6f8b27 100644
--- a/src/base/abci/abcGen.c
+++ b/src/base/abci/abcGen.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -660,7 +660,7 @@ void Abc_GenOneHotIntervals( char * pFileName, int nPis, int nRegs, Vec_Ptr_t *
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/aig/aig/aig.h"
+#include "aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcHaig.c b/src/base/abci/abcHaig.c
index 073defd0..d6c0ddad 100644
--- a/src/base/abci/abcHaig.c
+++ b/src/base/abci/abcHaig.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcIf.c b/src/base/abci/abcIf.c
index 0a4b9d56..01d156e1 100644
--- a/src/base/abci/abcIf.c
+++ b/src/base/abci/abcIf.c
@@ -18,11 +18,11 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/map/if/if.h"
-#include "src/bool/kit/kit.h"
-#include "src/aig/aig/aig.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "map/if/if.h"
+#include "bool/kit/kit.h"
+#include "aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcIfMux.c b/src/base/abci/abcIfMux.c
index 545adafb..69098b4f 100644
--- a/src/base/abci/abcIfMux.c
+++ b/src/base/abci/abcIfMux.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/map/if/if.h"
+#include "base/abc/abc.h"
+#include "map/if/if.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcIfif.c b/src/base/abci/abcIfif.c
index 33f1299c..d8cfa541 100644
--- a/src/base/abci/abcIfif.c
+++ b/src/base/abci/abcIfif.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/map/if/if.h"
+#include "base/abc/abc.h"
+#include "map/if/if.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcIvy.c b/src/base/abci/abcIvy.c
index 8df8d150..2d53a1ee 100644
--- a/src/base/abci/abcIvy.c
+++ b/src/base/abci/abcIvy.c
@@ -18,14 +18,14 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/dec/dec.h"
-#include "src/proof/fra/fra.h"
-#include "src/aig/ivy/ivy.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/map/mio/mio.h"
-#include "src/aig/aig/aig.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "bool/dec/dec.h"
+#include "proof/fra/fra.h"
+#include "aig/ivy/ivy.h"
+#include "proof/fraig/fraig.h"
+#include "map/mio/mio.h"
+#include "aig/aig/aig.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcLog.c b/src/base/abci/abcLog.c
index d2dddaa2..64f5d548 100644
--- a/src/base/abci/abcLog.c
+++ b/src/base/abci/abcLog.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/gia/gia.h"
+#include "base/abc/abc.h"
+#include "aig/gia/gia.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcLut.c b/src/base/abci/abcLut.c
index 1653918f..66db8e97 100644
--- a/src/base/abci/abcLut.c
+++ b/src/base/abci/abcLut.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/opt/cut/cut.h"
+#include "base/abc/abc.h"
+#include "opt/cut/cut.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcLutmin.c b/src/base/abci/abcLutmin.c
index bdeb53ff..b4856779 100644
--- a/src/base/abci/abcLutmin.c
+++ b/src/base/abci/abcLutmin.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMap.c b/src/base/abci/abcMap.c
index 988da5c2..4b76a541 100644
--- a/src/base/abci/abcMap.c
+++ b/src/base/abci/abcMap.c
@@ -18,10 +18,10 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/map/mapper/mapper.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "map/mapper/mapper.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMeasure.c b/src/base/abci/abcMeasure.c
index a366b830..72dba1a0 100644
--- a/src/base/abci/abcMeasure.c
+++ b/src/base/abci/abcMeasure.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/kit/kit.h"
+#include "base/abc/abc.h"
+#include "bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMerge.c b/src/base/abci/abcMerge.c
index cc606488..52fa817b 100644
--- a/src/base/abci/abcMerge.c
+++ b/src/base/abci/abcMerge.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/aig/aig.h"
-#include "src/opt/nwk/nwkMerge.h"
+#include "base/abc/abc.h"
+#include "aig/aig/aig.h"
+#include "opt/nwk/nwkMerge.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMffc.c b/src/base/abci/abcMffc.c
index 3a911c67..f55b3b52 100644
--- a/src/base/abci/abcMffc.c
+++ b/src/base/abci/abcMffc.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
  
diff --git a/src/base/abci/abcMini.c b/src/base/abci/abcMini.c
index 0af87d36..22f33909 100644
--- a/src/base/abci/abcMini.c
+++ b/src/base/abci/abcMini.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMiter.c b/src/base/abci/abcMiter.c
index 66734c04..feeaa617 100644
--- a/src/base/abci/abcMiter.c
+++ b/src/base/abci/abcMiter.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMulti.c b/src/base/abci/abcMulti.c
index c8247b28..8e4bbf28 100644
--- a/src/base/abci/abcMulti.c
+++ b/src/base/abci/abcMulti.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcMv.c b/src/base/abci/abcMv.c
index 5f612b62..d589c3e7 100644
--- a/src/base/abci/abcMv.c
+++ b/src/base/abci/abcMv.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcNpnSave.c b/src/base/abci/abcNpnSave.c
index b99b1e52..55603c6b 100644
--- a/src/base/abci/abcNpnSave.c
+++ b/src/base/abci/abcNpnSave.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/aig/aig.h"
+#include "base/abc/abc.h"
+#include "aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcNtbdd.c b/src/base/abci/abcNtbdd.c
index 2fac9497..0fc8c36c 100644
--- a/src/base/abci/abcNtbdd.c
+++ b/src/base/abci/abcNtbdd.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcOdc.c b/src/base/abci/abcOdc.c
index ff85035b..31f64732 100644
--- a/src/base/abci/abcOdc.c
+++ b/src/base/abci/abcOdc.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcOrder.c b/src/base/abci/abcOrder.c
index a3f66a63..fb837848 100644
--- a/src/base/abci/abcOrder.c
+++ b/src/base/abci/abcOrder.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcPart.c b/src/base/abci/abcPart.c
index 163c81b9..a92decc1 100644
--- a/src/base/abci/abcPart.c
+++ b/src/base/abci/abcPart.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/base/cmd/cmd.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "base/cmd/cmd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c
index afedabc2..0ec73fde 100644
--- a/src/base/abci/abcPrint.c
+++ b/src/base/abci/abcPrint.c
@@ -19,13 +19,13 @@
 ***********************************************************************/
 
 #include <math.h>
-#include "src/base/abc/abc.h"
-#include "src/bool/dec/dec.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/aig/aig/aig.h"
-#include "src/map/if/if.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "bool/dec/dec.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "aig/aig/aig.h"
+#include "map/if/if.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcProve.c b/src/base/abci/abcProve.c
index 0322b587..c61777fa 100644
--- a/src/base/abci/abcProve.c
+++ b/src/base/abci/abcProve.c
@@ -20,9 +20,9 @@
 
 #include <math.h>
 
-#include "src/base/abc/abc.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "proof/fraig/fraig.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcQbf.c b/src/base/abci/abcQbf.c
index 2fec2a07..0b53bc8a 100644
--- a/src/base/abci/abcQbf.c
+++ b/src/base/abci/abcQbf.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcQuant.c b/src/base/abci/abcQuant.c
index 0951795f..e6f0ccea 100644
--- a/src/base/abci/abcQuant.c
+++ b/src/base/abci/abcQuant.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcReach.c b/src/base/abci/abcReach.c
index 216dc2d2..e0fb4e51 100644
--- a/src/base/abci/abcReach.c
+++ b/src/base/abci/abcReach.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcRec.c b/src/base/abci/abcRec.c
index dd4beebd..83780233 100644
--- a/src/base/abci/abcRec.c
+++ b/src/base/abci/abcRec.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/map/if/if.h"
-#include "src/bool/kit/kit.h"
+#include "base/abc/abc.h"
+#include "map/if/if.h"
+#include "bool/kit/kit.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcReconv.c b/src/base/abci/abcReconv.c
index 4a5be4a2..56c2251a 100644
--- a/src/base/abci/abcReconv.c
+++ b/src/base/abci/abcReconv.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcRefactor.c b/src/base/abci/abcRefactor.c
index 22b88d28..cfc7bd39 100644
--- a/src/base/abci/abcRefactor.c
+++ b/src/base/abci/abcRefactor.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/dec/dec.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "bool/dec/dec.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcRenode.c b/src/base/abci/abcRenode.c
index a3891fda..9fd6d0eb 100644
--- a/src/base/abci/abcRenode.c
+++ b/src/base/abci/abcRenode.c
@@ -18,11 +18,11 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bdd/reo/reo.h"
-#include "src/map/if/if.h"
-#include "src/bool/kit/kit.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "bdd/reo/reo.h"
+#include "map/if/if.h"
+#include "bool/kit/kit.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcReorder.c b/src/base/abci/abcReorder.c
index 5fd041ae..4f8d50fa 100644
--- a/src/base/abci/abcReorder.c
+++ b/src/base/abci/abcReorder.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bdd/reo/reo.h"
+#include "base/abc/abc.h"
+#include "bdd/reo/reo.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcRestruct.c b/src/base/abci/abcRestruct.c
index 4be177f7..51af25c6 100644
--- a/src/base/abci/abcRestruct.c
+++ b/src/base/abci/abcRestruct.c
@@ -18,11 +18,11 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/dec/dec.h"
-#include "src/opt/cut/cut.h"
-#include "src/misc/extra/extraBdd.h"
-#include "src/bdd/dsd/dsd.h"
+#include "base/abc/abc.h"
+#include "bool/dec/dec.h"
+#include "opt/cut/cut.h"
+#include "misc/extra/extraBdd.h"
+#include "bdd/dsd/dsd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcResub.c b/src/base/abci/abcResub.c
index 8ae4795a..3c970c9f 100644
--- a/src/base/abci/abcResub.c
+++ b/src/base/abci/abcResub.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/dec/dec.h"
+#include "base/abc/abc.h"
+#include "bool/dec/dec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcRewrite.c b/src/base/abci/abcRewrite.c
index a1e19405..9ce83e5f 100644
--- a/src/base/abci/abcRewrite.c
+++ b/src/base/abci/abcRewrite.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/opt/rwr/rwr.h"
-#include "src/bool/dec/dec.h"
+#include "base/abc/abc.h"
+#include "opt/rwr/rwr.h"
+#include "bool/dec/dec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcRr.c b/src/base/abci/abcRr.c
index 83b7e85e..86bc40ed 100644
--- a/src/base/abci/abcRr.c
+++ b/src/base/abci/abcRr.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/opt/sim/sim.h"
+#include "base/abc/abc.h"
+#include "proof/fraig/fraig.h"
+#include "opt/sim/sim.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcSat.c b/src/base/abci/abcSat.c
index a10be364..c9987d70 100644
--- a/src/base/abci/abcSat.c
+++ b/src/base/abci/abcSat.c
@@ -18,11 +18,11 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/base/cmd/cmd.h"
-#include "src/sat/bsat/satSolver.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "base/cmd/cmd.h"
+#include "sat/bsat/satSolver.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcScorr.c b/src/base/abci/abcScorr.c
index 60199b33..f224a0fd 100644
--- a/src/base/abci/abcScorr.c
+++ b/src/base/abci/abcScorr.c
@@ -18,13 +18,13 @@
 
 ***********************************************************************/
  
-#include "src/base/abc/abc.h"
-#include "src/base/io/ioAbc.h"
-#include "src/aig/saig/saig.h"
-#include "src/proof/ssw/ssw.h"
-#include "src/aig/gia/gia.h"
-#include "src/proof/cec/cec.h"
-#include "src/aig/gia/giaAig.h"
+#include "base/abc/abc.h"
+#include "base/io/ioAbc.h"
+#include "aig/saig/saig.h"
+#include "proof/ssw/ssw.h"
+#include "aig/gia/gia.h"
+#include "proof/cec/cec.h"
+#include "aig/gia/giaAig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcSense.c b/src/base/abci/abcSense.c
index 3bcbc205..790793d9 100644
--- a/src/base/abci/abcSense.c
+++ b/src/base/abci/abcSense.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/proof/fraig/fraig.h"
+#include "base/abc/abc.h"
+#include "proof/fraig/fraig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcSpeedup.c b/src/base/abci/abcSpeedup.c
index 2c3ebca0..320f6aa5 100644
--- a/src/base/abci/abcSpeedup.c
+++ b/src/base/abci/abcSpeedup.c
@@ -18,10 +18,10 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/map/if/if.h"
-#include "src/aig/aig/aig.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "map/if/if.h"
+#include "aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcStrash.c b/src/base/abci/abcStrash.c
index 5bb93ada..b53a27e4 100644
--- a/src/base/abci/abcStrash.c
+++ b/src/base/abci/abcStrash.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/bool/dec/dec.h"
+#include "base/abc/abc.h"
+#include "bool/dec/dec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcSweep.c b/src/base/abci/abcSweep.c
index 453dd9ba..4b53f7e1 100644
--- a/src/base/abci/abcSweep.c
+++ b/src/base/abci/abcSweep.c
@@ -18,10 +18,10 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "proof/fraig/fraig.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcSymm.c b/src/base/abci/abcSymm.c
index 29927563..bf6a987b 100644
--- a/src/base/abci/abcSymm.c
+++ b/src/base/abci/abcSymm.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/opt/sim/sim.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "opt/sim/sim.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcTiming.c b/src/base/abci/abcTiming.c
index f0cccdca..87c0e2b3 100644
--- a/src/base/abci/abcTiming.c
+++ b/src/base/abci/abcTiming.c
@@ -18,9 +18,9 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcUnate.c b/src/base/abci/abcUnate.c
index 870b462b..1bd05cd6 100644
--- a/src/base/abci/abcUnate.c
+++ b/src/base/abci/abcUnate.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcUnreach.c b/src/base/abci/abcUnreach.c
index 72514029..2a203c96 100644
--- a/src/base/abci/abcUnreach.c
+++ b/src/base/abci/abcUnreach.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extraBdd.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcVerify.c b/src/base/abci/abcVerify.c
index 9b88cb8a..8367d23c 100644
--- a/src/base/abci/abcVerify.c
+++ b/src/base/abci/abcVerify.c
@@ -18,15 +18,15 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/main.h"
-#include "src/base/cmd/cmd.h"
-#include "src/proof/fraig/fraig.h"
-#include "src/opt/sim/sim.h"
-#include "src/aig/aig/aig.h"
-#include "src/aig/saig/saig.h"
-#include "src/aig/gia/gia.h"
-#include "src/proof/ssw/ssw.h"
+#include "base/abc/abc.h"
+#include "base/main/main.h"
+#include "base/cmd/cmd.h"
+#include "proof/fraig/fraig.h"
+#include "opt/sim/sim.h"
+#include "aig/aig/aig.h"
+#include "aig/saig/saig.h"
+#include "aig/gia/gia.h"
+#include "proof/ssw/ssw.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/abci/abcXsim.c b/src/base/abci/abcXsim.c
index 23bbbe1a..33f8544d 100644
--- a/src/base/abci/abcXsim.c
+++ b/src/base/abci/abcXsim.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/aig/gia/gia.h"
+#include "base/abc/abc.h"
+#include "aig/gia/gia.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c
index 6c8a3c2e..320f194f 100644
--- a/src/base/cmd/cmd.c
+++ b/src/base/cmd/cmd.c
@@ -24,10 +24,10 @@
 #include <unistd.h>
 #endif
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 #include "cmdInt.h"
-#include "src/misc/util/utilSignal.h"
+#include "misc/util/utilSignal.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdAlias.c b/src/base/cmd/cmdAlias.c
index 67cdc318..5afef7c8 100644
--- a/src/base/cmd/cmdAlias.c
+++ b/src/base/cmd/cmdAlias.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "cmdInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/cmd/cmdApi.c b/src/base/cmd/cmdApi.c
index 9357a93c..6ae9342d 100644
--- a/src/base/cmd/cmdApi.c
+++ b/src/base/cmd/cmdApi.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 #include "cmdInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/cmd/cmdFlag.c b/src/base/cmd/cmdFlag.c
index 7b46e8fc..f0ed38a1 100644
--- a/src/base/cmd/cmdFlag.c
+++ b/src/base/cmd/cmdFlag.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdHist.c b/src/base/cmd/cmdHist.c
index b6a4d535..ba467f76 100644
--- a/src/base/cmd/cmdHist.c
+++ b/src/base/cmd/cmdHist.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 #include "cmd.h"
 #include "cmdInt.h"
 
diff --git a/src/base/cmd/cmdInt.h b/src/base/cmd/cmdInt.h
index 6c1add92..149c26f1 100644
--- a/src/base/cmd/cmdInt.h
+++ b/src/base/cmd/cmdInt.h
@@ -26,7 +26,7 @@
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "src/base/main/mainInt.h"
+#include "base/main/mainInt.h"
 #include "cmd.h"
 
 ABC_NAMESPACE_HEADER_START
diff --git a/src/base/cmd/cmdLoad.c b/src/base/cmd/cmdLoad.c
index e4d8269a..7f7c1b60 100644
--- a/src/base/cmd/cmdLoad.c
+++ b/src/base/cmd/cmdLoad.c
@@ -18,11 +18,11 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 #include "cmd.h"
 #include "cmdInt.h"
-#include "src/misc/util/utilSignal.h"
+#include "misc/util/utilSignal.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdPlugin.c b/src/base/cmd/cmdPlugin.c
index e6b36f2a..429c2f72 100644
--- a/src/base/cmd/cmdPlugin.c
+++ b/src/base/cmd/cmdPlugin.c
@@ -25,11 +25,11 @@
 #include <unistd.h>
 #endif
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 #include "cmd.h"
 #include "cmdInt.h"
-#include "src/misc/util/utilSignal.h"
+#include "misc/util/utilSignal.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdUtils.c b/src/base/cmd/cmdUtils.c
index 0e62edac..10a97910 100644
--- a/src/base/cmd/cmdUtils.c
+++ b/src/base/cmd/cmdUtils.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/base/main/mainInt.h"
+#include "base/abc/abc.h"
+#include "base/main/mainInt.h"
 #include "cmdInt.h"
 #include <ctype.h>
 
diff --git a/src/base/io/io.c b/src/base/io/io.c
index 27e41540..55965642 100644
--- a/src/base/io/io.c
+++ b/src/base/io/io.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/mainInt.h"
-#include "src/aig/saig/saig.h"
+#include "base/main/mainInt.h"
+#include "aig/saig/saig.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -2023,7 +2023,7 @@ usage:
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/proof/fra/fra.h"
+#include "proof/fra/fra.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioAbc.h b/src/base/io/ioAbc.h
index 14d688f0..a5f56bfb 100644
--- a/src/base/io/ioAbc.h
+++ b/src/base/io/ioAbc.h
@@ -26,8 +26,8 @@
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "src/base/abc/abc.h"
-#include "src/misc/extra/extra.h"
+#include "base/abc/abc.h"
+#include "misc/extra/extra.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c
index 8ff32ac9..c063f337 100644
--- a/src/base/io/ioReadAiger.c
+++ b/src/base/io/ioReadAiger.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/bzlib/bzlib.h"
-#include "src/misc/zlib/zlib.h"
+#include "misc/bzlib/bzlib.h"
+#include "misc/zlib/zlib.h"
 #include "ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/io/ioReadBblif.c b/src/base/io/ioReadBblif.c
index ee7c5ee7..b3a34cc1 100644
--- a/src/base/io/ioReadBblif.c
+++ b/src/base/io/ioReadBblif.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/bool/dec/dec.h"
-#include "src/misc/bbl/bblif.h"
+#include "bool/dec/dec.h"
+#include "misc/bbl/bblif.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioReadBlif.c b/src/base/io/ioReadBlif.c
index b97cc1e7..592bee4a 100644
--- a/src/base/io/ioReadBlif.c
+++ b/src/base/io/ioReadBlif.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioReadBlifAig.c b/src/base/io/ioReadBlifAig.c
index 4bdb035e..ed4e4643 100644
--- a/src/base/io/ioReadBlifAig.c
+++ b/src/base/io/ioReadBlifAig.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/vec/vecPtr.h"
+#include "base/abc/abc.h"
+#include "misc/vec/vecPtr.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c
index 127c4537..32fa5a68 100644
--- a/src/base/io/ioReadBlifMv.c
+++ b/src/base/io/ioReadBlifMv.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
-#include "src/misc/vec/vecPtr.h"
+#include "base/abc/abc.h"
+#include "misc/vec/vecPtr.h"
 #include "ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
@@ -2029,8 +2029,8 @@ Io_MvVar_t * Abc_NtkMvVarDup( Abc_Ntk_t * pNtk, Io_MvVar_t * pVar )
 
 ABC_NAMESPACE_IMPL_END
 
-#include "src/map/mio/mio.h"
-#include "src/base/main/main.h"
+#include "map/mio/mio.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioReadVerilog.c b/src/base/io/ioReadVerilog.c
index da74d8d9..92083580 100644
--- a/src/base/io/ioReadVerilog.c
+++ b/src/base/io/ioReadVerilog.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/ver/ver.h"
+#include "base/ver/ver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioUtil.c b/src/base/io/ioUtil.c
index dbaa9138..86291710 100644
--- a/src/base/io/ioUtil.c
+++ b/src/base/io/ioUtil.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/main.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c
index ef2be673..20150839 100644
--- a/src/base/io/ioWriteAiger.c
+++ b/src/base/io/ioWriteAiger.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "src/misc/bzlib/bzlib.h"
-#include "src/misc/zlib/zlib.h"
+#include "misc/bzlib/bzlib.h"
+#include "misc/zlib/zlib.h"
 #include "ioAbc.h"
 
 
@@ -784,8 +784,8 @@ void Io_WriteAiger( Abc_Ntk_t * pNtk, char * pFileName, int fWriteSymbols, int f
 }
 
 
-#include "src/aig/gia/giaAig.h"
-#include "src/aig/saig/saig.h"
+#include "aig/gia/giaAig.h"
+#include "aig/saig/saig.h"
 
 /**Function*************************************************************
 
diff --git a/src/base/io/ioWriteBblif.c b/src/base/io/ioWriteBblif.c
index 09bb1da9..9e74b94e 100644
--- a/src/base/io/ioWriteBblif.c
+++ b/src/base/io/ioWriteBblif.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/misc/bbl/bblif.h"
+#include "misc/bbl/bblif.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioWriteBlif.c b/src/base/io/ioWriteBlif.c
index eff37870..54be8434 100644
--- a/src/base/io/ioWriteBlif.c
+++ b/src/base/io/ioWriteBlif.c
@@ -19,10 +19,10 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
-#include "src/bool/kit/kit.h"
-#include "src/map/if/if.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
+#include "bool/kit/kit.h"
+#include "map/if/if.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioWriteBlifMv.c b/src/base/io/ioWriteBlifMv.c
index fd054d5f..5d4ea46d 100644
--- a/src/base/io/ioWriteBlifMv.c
+++ b/src/base/io/ioWriteBlifMv.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioWriteBook.c b/src/base/io/ioWriteBook.c
index ae717c8d..92f49d62 100644
--- a/src/base/io/ioWriteBook.c
+++ b/src/base/io/ioWriteBook.c
@@ -20,8 +20,8 @@
 
 #include <math.h>
 
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 #include "ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/io/ioWriteCnf.c b/src/base/io/ioWriteCnf.c
index d5d377cc..19978060 100644
--- a/src/base/io/ioWriteCnf.c
+++ b/src/base/io/ioWriteCnf.c
@@ -19,7 +19,7 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/sat/bsat/satSolver.h"
+#include "sat/bsat/satSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioWriteDot.c b/src/base/io/ioWriteDot.c
index 9a9bcd82..1110e70e 100644
--- a/src/base/io/ioWriteDot.c
+++ b/src/base/io/ioWriteDot.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/io/ioWriteVerilog.c b/src/base/io/ioWriteVerilog.c
index 511eb9f0..ae233879 100644
--- a/src/base/io/ioWriteVerilog.c
+++ b/src/base/io/ioWriteVerilog.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ioAbc.h"
-#include "src/base/main/main.h"
-#include "src/map/mio/mio.h"
+#include "base/main/main.h"
+#include "map/mio/mio.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/main/libSupport.c b/src/base/main/libSupport.c
index dfcc0988..4d762413 100644
--- a/src/base/main/libSupport.c
+++ b/src/base/main/libSupport.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/main.c b/src/base/main/main.c
index 9194e9f1..b7d1c0a8 100644
--- a/src/base/main/main.c
+++ b/src/base/main/main.c
@@ -49,7 +49,7 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #include <Python.h>
 #endif /* ABC_PYTHON_EMBED */
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/main.h b/src/base/main/main.h
index c1abc54f..620ddac6 100644
--- a/src/base/main/main.h
+++ b/src/base/main/main.h
@@ -27,20 +27,20 @@
 ////////////////////////////////////////////////////////////////////////
 
 // core packages
-#include "src/base/abc/abc.h"
-#include "src/aig/gia/gia.h"
+#include "base/abc/abc.h"
+#include "aig/gia/gia.h"
 
 // data structure packages
-#include "src/misc/vec/vec.h"
-#include "src/misc/st/st.h"
+#include "misc/vec/vec.h"
+#include "misc/st/st.h"
 
 ABC_NAMESPACE_HEADER_START
 // the framework containing all data
 typedef struct Abc_Frame_t_      Abc_Frame_t;
 ABC_NAMESPACE_HEADER_END
 
-#include "src/base/cmd/cmd.h"
-#include "src/base/io/ioAbc.h"
+#include "base/cmd/cmd.h"
+#include "base/io/ioAbc.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c
index 296bf7c2..269a4f8f 100644
--- a/src/base/main/mainFrame.c
+++ b/src/base/main/mainFrame.c
@@ -18,10 +18,10 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "mainInt.h"
-#include "src/bool/dec/dec.h"
-#include "src/misc/extra/extraBdd.h"
+#include "bool/dec/dec.h"
+#include "misc/extra/extraBdd.h"
 
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/mainInit.c b/src/base/main/mainInit.c
index 75d52570..5061fa0d 100644
--- a/src/base/main/mainInit.c
+++ b/src/base/main/mainInit.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h
index aef02ba9..6ed12786 100644
--- a/src/base/main/mainInt.h
+++ b/src/base/main/mainInt.h
@@ -27,16 +27,16 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include "main.h"
-#include "src/misc/tim/tim.h"
-#include "src/map/if/if.h"
-#include "src/aig/aig/aig.h"
-#include "src/aig/gia/gia.h"
-#include "src/proof/ssw/ssw.h"
-#include "src/proof/fra/fra.h"
-//#include "src/aig/nwk/nwkMerge.h"
-//#include "src/aig/ntl/ntlnwk.h"
-#include "src/misc/ext/ext.h"
-#include "src/misc/extra/extraBdd.h"
+#include "misc/tim/tim.h"
+#include "map/if/if.h"
+#include "aig/aig/aig.h"
+#include "aig/gia/gia.h"
+#include "proof/ssw/ssw.h"
+#include "proof/fra/fra.h"
+//#include "aig/nwk/nwkMerge.h"
+//#include "aig/ntl/ntlnwk.h"
+#include "misc/ext/ext.h"
+#include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/base/main/mainLib.c b/src/base/main/mainLib.c
index 83bae04f..5af63d79 100644
--- a/src/base/main/mainLib.c
+++ b/src/base/main/mainLib.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/main/mainUtils.c b/src/base/main/mainUtils.c
index 5b6dc893..f0d602d3 100644
--- a/src/base/main/mainUtils.c
+++ b/src/base/main/mainUtils.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 #include "mainInt.h"
 
 #ifndef _WIN32
diff --git a/src/base/test/test.c b/src/base/test/test.c
index 92094d9a..d9bddef5 100644
--- a/src/base/test/test.c
+++ b/src/base/test/test.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/main/main.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/ver/ver.h b/src/base/ver/ver.h
index 8c9d6e00..48199a2e 100644
--- a/src/base/ver/ver.h
+++ b/src/base/ver/ver.h
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ////////////////////////////////////////////////////////////////////////
 ///                         PARAMETERS                               ///
diff --git a/src/base/ver/verCore.c b/src/base/ver/verCore.c
index 4c40346c..4e131c85 100644
--- a/src/base/ver/verCore.c
+++ b/src/base/ver/verCore.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "ver.h"
-#include "src/map/mio/mio.h"
-#include "src/base/main/main.h"
+#include "map/mio/mio.h"
+#include "base/main/main.h"
 
 ABC_NAMESPACE_IMPL_START