Updating project settings to have simpler include paths.

Makefile

@@ -35,7 +35,7 @@ arch_flags : arch_flags.c
 ARCHFLAGS := $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags)
 OPTFLAGS  := -g -O #-DABC_NAMESPACE=xxx
 
-CFLAGS   += -Wall -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -I$(PWD)
+CFLAGS   += -Wall -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -I$(PWD)/src
 CXXFLAGS += $(CFLAGS) 
 
 #LIBS := -m32 -ldl -rdynamic -lreadline -ltermcap

abcexe.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "C:/_projects/abc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:/_projects/abc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

abclib.dsp

@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "ReleaseLib"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "C:/_projects/abc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "DebugLib"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:/_projects/abc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

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                               ///

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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"
 
 ////////////////////////////////////////////////////////////////////////

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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                               ///

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                               ///

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                               ///

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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*************************************************************
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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                               ///

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
 

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
 

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
 

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
 

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 );

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
 

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
 

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

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
 

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
 

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
 

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
 

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>

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
 

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
 

src/base/abci/abcBalance.c

@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "src/base/abc/abc.h"
+#include "base/abc/abc.h"
 
 ABC_NAMESPACE_IMPL_START
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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