Major restructuring of the code.

13 files changed, 26 insertions, 26 deletions

diff --git a/src/sat/bsat/satChecker.c b/src/sat/bsat/satChecker.c
index 041bc9ed..7aec4a4d 100644
--- a/src/sat/bsat/satChecker.c
+++ b/src/sat/bsat/satChecker.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <assert.h>
 #include <time.h>
-#include "vec.h"
+#include "misc/vec/vec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/sat/bsat/satInterA.c b/src/sat/bsat/satInterA.c
index a635516c..01a5ca31 100644
--- a/src/sat/bsat/satInterA.c
+++ b/src/sat/bsat/satInterA.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <time.h>
 #include "satStore.h"
-#include "aig.h"
+#include "src/aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/sat/bsat/satInterB.c b/src/sat/bsat/satInterB.c
index 1ffb0dc5..5d348f62 100644
--- a/src/sat/bsat/satInterB.c
+++ b/src/sat/bsat/satInterB.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <time.h>
 #include "satStore.h"
-#include "aig.h"
+#include "src/aig/aig/aig.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/sat/bsat/satInterP.c b/src/sat/bsat/satInterP.c
index ff0b0e94..b8ab473a 100644
--- a/src/sat/bsat/satInterP.c
+++ b/src/sat/bsat/satInterP.c
@@ -25,7 +25,7 @@
 #include <time.h>
 
 #include "satStore.h"
-#include "vec.h"
+#include "src/misc/vec/vec.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/sat/bsat/satMem.h b/src/sat/bsat/satMem.h
index 8ea153a6..9dc9e692 100644
--- a/src/sat/bsat/satMem.h
+++ b/src/sat/bsat/satMem.h
@@ -18,14 +18,14 @@
 
 ***********************************************************************/
  
-#ifndef __SAT_MEM_H__
-#define __SAT_MEM_H__
+#ifndef ABC__sat__bsat__satMem_h
+#define ABC__sat__bsat__satMem_h
 
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "abc_global.h"
+#include "src/misc/util/abc_global.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/sat/bsat/satProof.c b/src/sat/bsat/satProof.c
index 79179952..111b3ece 100644
--- a/src/sat/bsat/satProof.c
+++ b/src/sat/bsat/satProof.c
@@ -19,8 +19,8 @@
 ***********************************************************************/
 
 #include "satSolver2.h"
-#include "vec.h"
-#include "aig.h"
+#include "src/misc/vec/vec.h"
+#include "src/aig/aig/aig.h"
 #include "satTruth.h"
 #include "vecRec.h"
 
@@ -610,7 +610,7 @@ void * Sat_ProofInterpolant( sat_solver2 * s, void * pGloVars )
 
     // start the AIG
     pAig = Aig_ManStart( 10000 );
-    pAig->pName = Aig_UtilStrsav( "interpol" );
+    pAig->pName = Abc_UtilStrsav( "interpol" );
     for ( i = 0; i < Vec_IntSize(vGlobVars); i++ )
         Aig_ObjCreatePi( pAig );
 
diff --git a/src/sat/bsat/satSolver.h b/src/sat/bsat/satSolver.h
index 0ca934ed..30b3742b 100644
--- a/src/sat/bsat/satSolver.h
+++ b/src/sat/bsat/satSolver.h
@@ -19,8 +19,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 **************************************************************************************************/
 // Modified to compile with MS Visual Studio 6.0 by Alan Mishchenko
 
-#ifndef satSolver_h
-#define satSolver_h
+#ifndef ABC__sat__bsat__satSolver_h
+#define ABC__sat__bsat__satSolver_h
 
 
 #include <stdio.h>
diff --git a/src/sat/bsat/satSolver2.h b/src/sat/bsat/satSolver2.h
index baccf68d..29279b86 100644
--- a/src/sat/bsat/satSolver2.h
+++ b/src/sat/bsat/satSolver2.h
@@ -19,8 +19,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 **************************************************************************************************/
 // Modified to compile with MS Visual Studio 6.0 by Alan Mishchenko
 
-#ifndef satSolver2_h
-#define satSolver2_h
+#ifndef ABC__sat__bsat__satSolver2_h
+#define ABC__sat__bsat__satSolver2_h
 
 
 #include <stdio.h>
diff --git a/src/sat/bsat/satSolver_old.h b/src/sat/bsat/satSolver_old.h
index 4c577b1e..d2228f79 100644
--- a/src/sat/bsat/satSolver_old.h
+++ b/src/sat/bsat/satSolver_old.h
@@ -19,8 +19,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 **************************************************************************************************/
 // Modified to compile with MS Visual Studio 6.0 by Alan Mishchenko
 
-#ifndef satSolver_h
-#define satSolver_h
+#ifndef ABC__sat__bsat__satSolver_old_h
+#define ABC__sat__bsat__satSolver_old_h
 
 
 #include <stdio.h>
diff --git a/src/sat/bsat/satStore.h b/src/sat/bsat/satStore.h
index 0293aea7..206c6939 100644
--- a/src/sat/bsat/satStore.h
+++ b/src/sat/bsat/satStore.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __SAT_STORE_H__
-#define __SAT_STORE_H__
+#ifndef ABC__sat__bsat__satStore_h
+#define ABC__sat__bsat__satStore_h
 
 
 /*
diff --git a/src/sat/bsat/satTruth.h b/src/sat/bsat/satTruth.h
index e07518b0..2f17b6f0 100644
--- a/src/sat/bsat/satTruth.h
+++ b/src/sat/bsat/satTruth.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __SAT_TRUTH_H__
-#define __SAT_TRUTH_H__
+#ifndef ABC__sat__bsat__satTruth_h
+#define ABC__sat__bsat__satTruth_h
 
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "abc_global.h"
+#include "src/misc/util/abc_global.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/sat/bsat/satVec.h b/src/sat/bsat/satVec.h
index bf117521..01740580 100644
--- a/src/sat/bsat/satVec.h
+++ b/src/sat/bsat/satVec.h
@@ -19,10 +19,10 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 **************************************************************************************************/
 // Modified to compile with MS Visual Studio 6.0 by Alan Mishchenko
 
-#ifndef satVec_h
-#define satVec_h
+#ifndef ABC__sat__bsat__satVec_h
+#define ABC__sat__bsat__satVec_h
 
-#include "abc_global.h"
+#include "src/misc/util/abc_global.h"
 
 ABC_NAMESPACE_HEADER_START
 
diff --git a/src/sat/bsat/vecRec.h b/src/sat/bsat/vecRec.h
index e92129be..82d7183d 100644
--- a/src/sat/bsat/vecRec.h
+++ b/src/sat/bsat/vecRec.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __VEC_REC_H__
-#define __VEC_REC_H__
+#ifndef ABC__sat__bsat__vecRec_h
+#define ABC__sat__bsat__vecRec_h
 
 
 ////////////////////////////////////////////////////////////////////////