Changes to be able to compile ABC without CUDD.

5 files changed, 163 insertions, 163 deletions

diff --git a/Makefile b/Makefile
index a7b971bb..3b758761 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ arch_flags : arch_flags.c
 ARCHFLAGS ?= $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags)
 ARCHFLAGS := $(ARCHFLAGS)
 
-OPTFLAGS  ?= -g -O #-DABC_NAMESPACE=xxx
+OPTFLAGS  ?= -g -O -DABC_USE_CUDD #-DABC_NAMESPACE=xxx
 
 CFLAGS    += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
 ifneq ($(findstring arm,$(shell uname -m)),)
diff --git a/abcexe.dsp b/abcexe.dsp
index 4f8742e3..9d5152fc 100644
--- a/abcexe.dsp
+++ b/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 "src" /D "WIN32" /D "WINDOWS" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "WINDOWS" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /D "ABC_USE_CUDD" /FR /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,7 +67,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 "src" /D "WIN32" /D "WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /D "ABC_USE_CUDD" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/abclib.dsp b/abclib.dsp
index e81c98ef..b0e82fa8 100644
--- a/abclib.dsp
+++ b/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 "src" /D "WIN32" /D "WINDOWS" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "WINDOWS" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /D "ABC_USE_CUDD" /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 "src" /D "WIN32" /D "WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /D "ABC_USE_CUDD" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -954,272 +954,272 @@ SOURCE=.\src\base\cba\cbaWriteVer.c
 # Begin Group "bdd"
 
 # PROP Default_Filter ""
-# Begin Group "cudd"
+# Begin Group "extrab"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cudd.h
+SOURCE=.\src\bdd\extrab\extraBdd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddAbs.c
+SOURCE=.\src\bdd\extrab\extraBddAuto.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddApply.c
+SOURCE=.\src\bdd\extrab\extraBddCas.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddFind.c
+SOURCE=.\src\bdd\extrab\extraBddImage.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddInv.c
+SOURCE=.\src\bdd\extrab\extraBddKmap.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddIte.c
+SOURCE=.\src\bdd\extrab\extraBddMisc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddNeg.c
+SOURCE=.\src\bdd\extrab\extraBddSymm.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAddWalsh.c
+SOURCE=.\src\bdd\extrab\extraBddTime.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAndAbs.c
+SOURCE=.\src\bdd\extrab\extraBddUnate.c
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "llb"
 
-SOURCE=.\src\bdd\cudd\cuddAnneal.c
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddApa.c
+SOURCE=.\src\bdd\llb\llb.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddAPI.c
+SOURCE=.\src\bdd\llb\llb1Cluster.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddApprox.c
+SOURCE=.\src\bdd\llb\llb1Constr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddBddAbs.c
+SOURCE=.\src\bdd\llb\llb1Core.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddBddCorr.c
+SOURCE=.\src\bdd\llb\llb1Group.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddBddIte.c
+SOURCE=.\src\bdd\llb\llb1Hint.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddBridge.c
+SOURCE=.\src\bdd\llb\llb1Man.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddCache.c
+SOURCE=.\src\bdd\llb\llb1Matrix.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddCheck.c
+SOURCE=.\src\bdd\llb\llb1Pivot.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddClip.c
+SOURCE=.\src\bdd\llb\llb1Reach.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddCof.c
+SOURCE=.\src\bdd\llb\llb1Sched.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddCompose.c
+SOURCE=.\src\bdd\llb\llb2Bad.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddDecomp.c
+SOURCE=.\src\bdd\llb\llb2Core.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddEssent.c
+SOURCE=.\src\bdd\llb\llb2Driver.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddExact.c
+SOURCE=.\src\bdd\llb\llb2Dump.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddExport.c
+SOURCE=.\src\bdd\llb\llb2Flow.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddGenCof.c
+SOURCE=.\src\bdd\llb\llb2Image.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddGenetic.c
+SOURCE=.\src\bdd\llb\llb3Image.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddGroup.c
+SOURCE=.\src\bdd\llb\llb3Nonlin.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddHarwell.c
+SOURCE=.\src\bdd\llb\llb4Cex.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddInit.c
+SOURCE=.\src\bdd\llb\llb4Cluster.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddInt.h
+SOURCE=.\src\bdd\llb\llb4Image.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddInteract.c
+SOURCE=.\src\bdd\llb\llb4Map.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddLCache.c
+SOURCE=.\src\bdd\llb\llb4Nonlin.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddLevelQ.c
+SOURCE=.\src\bdd\llb\llb4Sweep.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddLinear.c
+SOURCE=.\src\bdd\llb\llbInt.h
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "bbr"
 
-SOURCE=.\src\bdd\cudd\cuddLiteral.c
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddMatMult.c
+SOURCE=.\src\bdd\bbr\bbr.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddPriority.c
+SOURCE=.\src\bdd\bbr\bbrCex.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddRead.c
+SOURCE=.\src\bdd\bbr\bbrImage.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddRef.c
+SOURCE=.\src\bdd\bbr\bbrNtbdd.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddReorder.c
+SOURCE=.\src\bdd\bbr\bbrReach.c
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "cas"
 
-SOURCE=.\src\bdd\cudd\cuddSat.c
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddSign.c
+SOURCE=.\src\bdd\cas\cas.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddSolve.c
+SOURCE=.\src\bdd\cas\casCore.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddSplit.c
+SOURCE=.\src\bdd\cas\casDec.c
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "reo"
 
-SOURCE=.\src\bdd\cudd\cuddSubsetHB.c
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddSubsetSP.c
+SOURCE=.\src\bdd\reo\reo.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddSymmetry.c
+SOURCE=.\src\bdd\reo\reoApi.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddTable.c
+SOURCE=.\src\bdd\reo\reoCore.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddUtil.c
+SOURCE=.\src\bdd\reo\reoProfile.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddWindow.c
+SOURCE=.\src\bdd\reo\reoShuffle.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddCount.c
+SOURCE=.\src\bdd\reo\reoSift.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddFuncs.c
+SOURCE=.\src\bdd\reo\reoSwap.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddGroup.c
+SOURCE=.\src\bdd\reo\reoTest.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddIsop.c
+SOURCE=.\src\bdd\reo\reoTransfer.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddLin.c
+SOURCE=.\src\bdd\reo\reoUnits.c
 # End Source File
+# End Group
+# Begin Group "dsd"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddMisc.c
+SOURCE=.\src\bdd\dsd\dsd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddPort.c
+SOURCE=.\src\bdd\dsd\dsdApi.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddReord.c
+SOURCE=.\src\bdd\dsd\dsdCheck.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddSetop.c
+SOURCE=.\src\bdd\dsd\dsdInt.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddSymm.c
+SOURCE=.\src\bdd\dsd\dsdLocal.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cudd\cuddZddUtil.c
+SOURCE=.\src\bdd\dsd\dsdMan.c
 # End Source File
-# End Group
-# Begin Group "epd"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\epd\epd.c
+SOURCE=.\src\bdd\dsd\dsdProc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\epd\epd.h
+SOURCE=.\src\bdd\dsd\dsdTree.c
 # End Source File
 # End Group
 # Begin Group "mtr"
@@ -1242,272 +1242,272 @@ SOURCE=.\src\bdd\mtr\mtrGroup.c
 SOURCE=.\src\bdd\mtr\mtrInt.h
 # End Source File
 # End Group
-# Begin Group "dsd"
+# Begin Group "epd"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsd.h
+SOURCE=.\src\bdd\epd\epd.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdApi.c
+SOURCE=.\src\bdd\epd\epd.h
 # End Source File
+# End Group
+# Begin Group "cudd"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdCheck.c
+SOURCE=.\src\bdd\cudd\cudd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdInt.h
+SOURCE=.\src\bdd\cudd\cuddAddAbs.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdLocal.c
+SOURCE=.\src\bdd\cudd\cuddAddApply.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdMan.c
+SOURCE=.\src\bdd\cudd\cuddAddFind.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdProc.c
+SOURCE=.\src\bdd\cudd\cuddAddInv.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\dsd\dsdTree.c
+SOURCE=.\src\bdd\cudd\cuddAddIte.c
 # End Source File
-# End Group
-# Begin Group "reo"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reo.h
+SOURCE=.\src\bdd\cudd\cuddAddNeg.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoApi.c
+SOURCE=.\src\bdd\cudd\cuddAddWalsh.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoCore.c
+SOURCE=.\src\bdd\cudd\cuddAndAbs.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoProfile.c
+SOURCE=.\src\bdd\cudd\cuddAnneal.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoShuffle.c
+SOURCE=.\src\bdd\cudd\cuddApa.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoSift.c
+SOURCE=.\src\bdd\cudd\cuddAPI.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoSwap.c
+SOURCE=.\src\bdd\cudd\cuddApprox.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoTest.c
+SOURCE=.\src\bdd\cudd\cuddBddAbs.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoTransfer.c
+SOURCE=.\src\bdd\cudd\cuddBddCorr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\reo\reoUnits.c
+SOURCE=.\src\bdd\cudd\cuddBddIte.c
 # End Source File
-# End Group
-# Begin Group "cas"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\src\bdd\cudd\cuddBridge.c
+# End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cas\cas.h
+SOURCE=.\src\bdd\cudd\cuddCache.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cas\casCore.c
+SOURCE=.\src\bdd\cudd\cuddCheck.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\cas\casDec.c
+SOURCE=.\src\bdd\cudd\cuddClip.c
 # End Source File
-# End Group
-# Begin Group "bbr"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\src\bdd\cudd\cuddCof.c
+# End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\bbr\bbr.h
+SOURCE=.\src\bdd\cudd\cuddCompose.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\bbr\bbrCex.c
+SOURCE=.\src\bdd\cudd\cuddDecomp.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\bbr\bbrImage.c
+SOURCE=.\src\bdd\cudd\cuddEssent.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\bbr\bbrNtbdd.c
+SOURCE=.\src\bdd\cudd\cuddExact.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\bbr\bbrReach.c
+SOURCE=.\src\bdd\cudd\cuddExport.c
 # End Source File
-# End Group
-# Begin Group "llb"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\src\bdd\cudd\cuddGenCof.c
+# End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb.h
+SOURCE=.\src\bdd\cudd\cuddGenetic.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Cluster.c
+SOURCE=.\src\bdd\cudd\cuddGroup.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Constr.c
+SOURCE=.\src\bdd\cudd\cuddHarwell.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Core.c
+SOURCE=.\src\bdd\cudd\cuddInit.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Group.c
+SOURCE=.\src\bdd\cudd\cuddInt.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Hint.c
+SOURCE=.\src\bdd\cudd\cuddInteract.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Man.c
+SOURCE=.\src\bdd\cudd\cuddLCache.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Matrix.c
+SOURCE=.\src\bdd\cudd\cuddLevelQ.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Pivot.c
+SOURCE=.\src\bdd\cudd\cuddLinear.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Reach.c
+SOURCE=.\src\bdd\cudd\cuddLiteral.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb1Sched.c
+SOURCE=.\src\bdd\cudd\cuddMatMult.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb2Bad.c
+SOURCE=.\src\bdd\cudd\cuddPriority.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb2Core.c
+SOURCE=.\src\bdd\cudd\cuddRead.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb2Driver.c
+SOURCE=.\src\bdd\cudd\cuddRef.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb2Dump.c
+SOURCE=.\src\bdd\cudd\cuddReorder.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb2Flow.c
+SOURCE=.\src\bdd\cudd\cuddSat.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb2Image.c
+SOURCE=.\src\bdd\cudd\cuddSign.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb3Image.c
+SOURCE=.\src\bdd\cudd\cuddSolve.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb3Nonlin.c
+SOURCE=.\src\bdd\cudd\cuddSplit.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb4Cex.c
+SOURCE=.\src\bdd\cudd\cuddSubsetHB.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb4Cluster.c
+SOURCE=.\src\bdd\cudd\cuddSubsetSP.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb4Image.c
+SOURCE=.\src\bdd\cudd\cuddSymmetry.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb4Map.c
+SOURCE=.\src\bdd\cudd\cuddTable.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb4Nonlin.c
+SOURCE=.\src\bdd\cudd\cuddUtil.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llb4Sweep.c
+SOURCE=.\src\bdd\cudd\cuddWindow.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\llb\llbInt.h
+SOURCE=.\src\bdd\cudd\cuddZddCount.c
 # End Source File
-# End Group
-# Begin Group "extrab"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\src\bdd\cudd\cuddZddFuncs.c
+# End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBdd.h
+SOURCE=.\src\bdd\cudd\cuddZddGroup.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddAuto.c
+SOURCE=.\src\bdd\cudd\cuddZddIsop.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddCas.c
+SOURCE=.\src\bdd\cudd\cuddZddLin.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddImage.c
+SOURCE=.\src\bdd\cudd\cuddZddMisc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddKmap.c
+SOURCE=.\src\bdd\cudd\cuddZddPort.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddMisc.c
+SOURCE=.\src\bdd\cudd\cuddZddReord.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddSymm.c
+SOURCE=.\src\bdd\cudd\cuddZddSetop.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddTime.c
+SOURCE=.\src\bdd\cudd\cuddZddSymm.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\bdd\extrab\extraBddUnate.c
+SOURCE=.\src\bdd\cudd\cuddZddUtil.c
 # End Source File
 # End Group
 # End Group
diff --git a/src/aig/saig/saigDup.c b/src/aig/saig/saigDup.c
index dfeb2e43..b16e3c3b 100644
--- a/src/aig/saig/saigDup.c
+++ b/src/aig/saig/saigDup.c
@@ -586,7 +586,7 @@ Aig_Man_t * Saig_ManDupCones( Aig_Man_t * pAig, int * pPos, int nPos )
 
 }
 
-#ifdef ABC_USE_CUDD
+#ifndef ABC_USE_CUDD
 int Aig_ManVerifyUsingBdds( Aig_Man_t * pInit, Saig_ParBbr_t * pPars ) { return 0; }
 void Bbr_ManSetDefaultParams( Saig_ParBbr_t * p ) {}
 #endif
diff --git a/src/bool/kit/kitBdd.c b/src/bool/kit/kitBdd.c
index 9c7c918d..8625791d 100644
--- a/src/bool/kit/kitBdd.c
+++ b/src/bool/kit/kitBdd.c
@@ -21,7 +21,7 @@
 #include "kit.h"
 
 #ifdef ABC_USE_CUDD
-#include "misc/extra/extraBdd.h"
+#include "bdd/extrab/extraBdd.h"
 #endif
 
 ABC_NAMESPACE_IMPL_START