initial commit of public abc

43 files changed, 228 insertions, 4 deletions

diff --git a/src/misc/espresso/cofactor.c b/src/misc/espresso/cofactor.c
index 1a2c6e8a..fec36afd 100644
--- a/src/misc/espresso/cofactor.c
+++ b/src/misc/espresso/cofactor.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
     The cofactor of a cover against a cube "c" is a cover formed by the
     cofactor of each cube in the cover against c.  The cofactor of two
@@ -382,3 +385,5 @@ pcube *T;
     *Tdest++ = NULL;                /* sentinel */
     Tdest[1] = (pcube) Tdest;            /* save pointer to last */
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cols.c b/src/misc/espresso/cols.c
index ec3797e6..95f1ce7f 100644
--- a/src/misc/espresso/cols.c
+++ b/src/misc/espresso/cols.c
@@ -10,6 +10,9 @@
 //#include "port.h"
 #include "sparse_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 /*
  *  allocate a new col vector 
@@ -312,3 +315,5 @@ sm_col *pcol;
     (void) fprintf(fp, " %d", p->row_num);
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/compl.c b/src/misc/espresso/compl.c
index 8f1c6606..a17eb278 100644
--- a/src/misc/espresso/compl.c
+++ b/src/misc/espresso/compl.c
@@ -26,6 +26,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 #define USE_COMPL_LIFT            0
 #define USE_COMPL_LIFT_ONSET        1
 #define USE_COMPL_LIFT_ONSET_COMPLEX    2
@@ -678,3 +681,5 @@ pcover *Tnew;            /* returned only if answer determined */
     return MAYBE;
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/contain.c b/src/misc/espresso/contain.c
index 710c4894..e6073076 100644
--- a/src/misc/espresso/contain.c
+++ b/src/misc/espresso/contain.c
@@ -24,6 +24,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 /*
     sf_contain -- perform containment on a set family (delete sets which
@@ -443,3 +446,5 @@ IN int totcnt, size;
     FREE(E1);
     return R;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cubehack.c b/src/misc/espresso/cubehack.c
index 8e1724fc..58935716 100644
--- a/src/misc/espresso/cubehack.c
+++ b/src/misc/espresso/cubehack.c
@@ -27,6 +27,9 @@ bool use_random_order;
 */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 void 
 cautious_define_cube_size(n)
@@ -136,3 +139,5 @@ set_espresso_flags()
     use_super_gasp = FALSE;
     use_random_order = FALSE;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cubestr.c b/src/misc/espresso/cubestr.c
index 77389e73..4b6dbcea 100644
--- a/src/misc/espresso/cubestr.c
+++ b/src/misc/espresso/cubestr.c
@@ -13,6 +13,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
     cube_setup -- assume that the fields "num_vars", "num_binary_vars", and
     part_size[num_binary_vars .. num_vars-1] are setup, and initialize the
@@ -150,3 +153,5 @@ void restore_cube_struct()
     cube = temp_cube_save;              /* structure copy ! */
     cdata = temp_cdata_save;            /*      ""          */
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cvrin.c b/src/misc/espresso/cvrin.c
index d33db46a..993a9841 100644
--- a/src/misc/espresso/cvrin.c
+++ b/src/misc/espresso/cvrin.c
@@ -15,6 +15,9 @@
 #include <ctype.h>
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static bool line_length_error;
 static int lineno;
 
@@ -809,3 +812,5 @@ int *ip;
     }
     return FALSE;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cvrm.c b/src/misc/espresso/cvrm.c
index f55178e8..2a573ae0 100644
--- a/src/misc/espresso/cvrm.c
+++ b/src/misc/espresso/cvrm.c
@@ -17,6 +17,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 static void cb_unravel(c, start, end, startbase, B1)
 IN register pcube c;
@@ -537,3 +540,5 @@ int i;
     PLA->F = NULL;
     return 1;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cvrmisc.c b/src/misc/espresso/cvrmisc.c
index 0f3de195..995c37a1 100644
--- a/src/misc/espresso/cvrmisc.c
+++ b/src/misc/espresso/cvrmisc.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 /* cost -- compute the cost of a cover */
 void cover_cost(F, cost)
@@ -140,3 +143,5 @@ char *s;
     (void) fprintf(stderr, "espresso: %s\n", s);
     exit(1);
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/cvrout.c b/src/misc/espresso/cvrout.c
index 60b9d9e8..4ac1cfd7 100644
--- a/src/misc/espresso/cvrout.c
+++ b/src/misc/espresso/cvrout.c
@@ -14,6 +14,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 void fprint_pla(fp, PLA, output_type)
 INOUT FILE *fp;
 IN pPLA PLA;
@@ -571,7 +574,7 @@ int output_symbolic;
     }
 
 
-    /* Print out the contraints */
+    /* Print out the constraints */
     if (! output_symbolic) {
         (void) fprintf(fp,
         "# Symbolic constraints for variable %d (Numeric form)\n", var);
@@ -607,3 +610,5 @@ int output_symbolic;
     }
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/dominate.c b/src/misc/espresso/dominate.c
index a930d453..6cdc5d79 100644
--- a/src/misc/espresso/dominate.c
+++ b/src/misc/espresso/dominate.c
@@ -9,6 +9,9 @@
  */
 #include "mincov_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 int 
 sm_row_dominance(A)
@@ -96,3 +99,5 @@ int *weight;
 
     return colcnt - A->ncols;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/equiv.c b/src/misc/espresso/equiv.c
index f6495f1f..6c7fb89b 100644
--- a/src/misc/espresso/equiv.c
+++ b/src/misc/espresso/equiv.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 void find_equiv_outputs(PLA)
 pPLA PLA;
@@ -92,3 +95,5 @@ pcover f1, f2;
 
     return TRUE;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/espresso.c b/src/misc/espresso/espresso.c
index 8f05d43f..296f5673 100644
--- a/src/misc/espresso/espresso.c
+++ b/src/misc/espresso/espresso.c
@@ -47,6 +47,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 pcover espresso(F, D1, R)
 pcover F, D1, R;
 {
@@ -137,3 +140,5 @@ begin:
 
     return F;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/espresso.h b/src/misc/espresso/espresso.h
index 3ca331ac..27d1c124 100644
--- a/src/misc/espresso/espresso.h
+++ b/src/misc/espresso/espresso.h
@@ -56,7 +56,11 @@
 
 /* Define host machine characteristics of "unsigned int" */
 #ifndef BPI
-#define BPI             32              /* # bits per integer */
+#define BPI
+
+
+ABC_NAMESPACE_HEADER_START
+             32              /* # bits per integer */
 #endif
 
 #if BPI == 32
@@ -509,6 +513,10 @@ extern struct cdata_struct cdata, temp_cdata_save;
 #else
 #define DISJOINT 0x5555
 #endif
+
+
+ABC_NAMESPACE_HEADER_END
+
 #endif
 
 /* function declarations */
diff --git a/src/misc/espresso/essen.c b/src/misc/espresso/essen.c
index 6a46295d..c4f9999b 100644
--- a/src/misc/espresso/essen.c
+++ b/src/misc/espresso/essen.c
@@ -14,6 +14,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
     essential -- return a cover consisting of the cubes of F which are
     essential prime implicants (with respect to F u D); Further, remove
@@ -177,3 +180,5 @@ register pcube p, c;
     set_free(temp);
     return R;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/exact.c b/src/misc/espresso/exact.c
index b1943636..8bfa1ce3 100644
--- a/src/misc/espresso/exact.c
+++ b/src/misc/espresso/exact.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 static void dump_irredundant();
 static pcover do_minimize();
@@ -179,3 +182,5 @@ sm_matrix *table;
     (void) fclose(fp_pi_table);
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/expand.c b/src/misc/espresso/expand.c
index 6b41a786..050626d5 100644
--- a/src/misc/espresso/expand.c
+++ b/src/misc/espresso/expand.c
@@ -39,6 +39,9 @@
 */
 
 #include "espresso.h"
+
+ABC_NAMESPACE_IMPL_START
+
 
 /*
     expand -- expand each nonprime cube of F into a prime implicant
@@ -693,3 +696,5 @@ pcover F, R;
     set_free(FREESET);
     return Fall_primes;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/gasp.c b/src/misc/espresso/gasp.c
index aa3254d3..76e1233e 100644
--- a/src/misc/espresso/gasp.c
+++ b/src/misc/espresso/gasp.c
@@ -26,6 +26,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 /*
  *  reduce_gasp -- compute the maximal reduction of each cube of F
@@ -226,3 +229,5 @@ cost_t *cost;
     EXECUTE(F = irredundant(G, D), IRRED_TIME, F, *cost);
     return F;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/gimpel.c b/src/misc/espresso/gimpel.c
index 4b75ae59..01d5e418 100644
--- a/src/misc/espresso/gimpel.c
+++ b/src/misc/espresso/gimpel.c
@@ -9,6 +9,9 @@
  */
 #include "mincov_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 /*
  *  check for:
@@ -105,3 +108,5 @@ solution_t **best;
     return 0;
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/globals.c b/src/misc/espresso/globals.c
index 2ec1d1db..9f43e0b0 100644
--- a/src/misc/espresso/globals.c
+++ b/src/misc/espresso/globals.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
  *    Global Variable Declarations
  */
@@ -74,3 +77,5 @@ int bit_count[256] = {
   2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
   3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8
 };
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/hack.c b/src/misc/espresso/hack.c
index 13cdf895..a3efec1c 100644
--- a/src/misc/espresso/hack.c
+++ b/src/misc/espresso/hack.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 void map_dcset(PLA)
 pPLA PLA;
 {
@@ -639,3 +642,5 @@ int verbose_mode;
     kiss_print_cube(stdout, PLA, p, "~1");
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/indep.c b/src/misc/espresso/indep.c
index 10b363a0..52de654b 100644
--- a/src/misc/espresso/indep.c
+++ b/src/misc/espresso/indep.c
@@ -9,6 +9,9 @@
  */
 #include "mincov_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static sm_matrix *build_intersection_matrix();
 
 
@@ -132,3 +135,5 @@ sm_matrix *A;
 
     return B;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/irred.c b/src/misc/espresso/irred.c
index 2e9f4e26..fadc2256 100644
--- a/src/misc/espresso/irred.c
+++ b/src/misc/espresso/irred.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static void fcube_is_covered();
 static void ftautology();
 static bool ftaut_special_cases();
@@ -438,3 +441,5 @@ start:
     /* Not much we can do about it */
     return MAYBE;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/main.c b/src/misc/espresso/main.c
index 0a511c0e..157ef5a0 100644
--- a/src/misc/espresso/main.c
+++ b/src/misc/espresso/main.c
@@ -14,7 +14,10 @@
  */
 
 #include "espresso.h"
-#include "main.h"        /* table definitions for options */
+#include "main.h"
+
+ABC_NAMESPACE_IMPL_START
+        /* table definitions for options */
 
 static FILE *last_fp;
 static int input_type = FD_type;
@@ -744,3 +747,5 @@ register char *argv[], *s;
     }
     return FALSE;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/map.c b/src/misc/espresso/map.c
index 68168745..7fdf1340 100644
--- a/src/misc/espresso/map.c
+++ b/src/misc/espresso/map.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static pcube Gcube;
 static pset Gminterm;
 
@@ -115,3 +118,5 @@ pcover T;
     }
     set_free(m);
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/matrix.c b/src/misc/espresso/matrix.c
index 747fe54f..08fa1f95 100644
--- a/src/misc/espresso/matrix.c
+++ b/src/misc/espresso/matrix.c
@@ -10,6 +10,9 @@
 //#include "port.h"
 #include "sparse_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
  *  free-lists are only used if 'FAST_AND_LOOSE' is set; this is because
  *  we lose the debugging capability of libmm_t which trashes objects when
@@ -572,3 +575,5 @@ sm_cleanup()
     sm_col_freelist = 0;
 #endif
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/mincov.c b/src/misc/espresso/mincov.c
index ee18a3f1..3f9410f6 100644
--- a/src/misc/espresso/mincov.c
+++ b/src/misc/espresso/mincov.c
@@ -9,6 +9,9 @@
  */
 #include "mincov_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
  *  mincov.c
  */
@@ -376,3 +379,5 @@ sm_row *cover;
     }
     return 1;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/opo.c b/src/misc/espresso/opo.c
index 19522f89..52dc4d76 100644
--- a/src/misc/espresso/opo.c
+++ b/src/misc/espresso/opo.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
  *   Phase assignment technique (T. Sasao):
  *
@@ -622,3 +625,5 @@ pPLA PLA;
     EXEC_S(PLA->F = espresso(PLA->F, PLA->D, PLA->R), "ESPRESSO  ",PLA->F);
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/pair.c b/src/misc/espresso/pair.c
index a5345178..26d27716 100644
--- a/src/misc/espresso/pair.c
+++ b/src/misc/espresso/pair.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 void set_pair(PLA)
 pPLA PLA;
 {
@@ -678,3 +681,5 @@ register ppair pair;
     FREE(pair->var2);
     FREE(pair);
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/part.c b/src/misc/espresso/part.c
index 42843aeb..32baeda7 100644
--- a/src/misc/espresso/part.c
+++ b/src/misc/espresso/part.c
@@ -9,6 +9,9 @@
  */
 #include "mincov_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static int visit_col();
 
 static void
@@ -120,3 +123,5 @@ sm_matrix **L, **R;
     return 1;
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/primes.c b/src/misc/espresso/primes.c
index 3e40da27..52792857 100644
--- a/src/misc/espresso/primes.c
+++ b/src/misc/espresso/primes.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static bool primes_consensus_special_cases();
 static pcover primes_consensus_merge();
 static pcover and_with_cofactor(); 
@@ -168,3 +171,5 @@ register pset cof;
     }
     return sf_inactive(A);
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/reduce.c b/src/misc/espresso/reduce.c
index 00e4507f..45241439 100644
--- a/src/misc/espresso/reduce.c
+++ b/src/misc/espresso/reduce.c
@@ -18,6 +18,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static bool toggle = TRUE;
 
 
@@ -256,3 +259,5 @@ OUT pcube *result;              /* returned only if answer determined */
     /* Not much we can do about it */
     return MAYBE;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/rows.c b/src/misc/espresso/rows.c
index bf0c0baa..b807153e 100644
--- a/src/misc/espresso/rows.c
+++ b/src/misc/espresso/rows.c
@@ -10,6 +10,9 @@
 //#include "port.h"
 #include "sparse_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 /*
  *  allocate a new row vector 
@@ -312,3 +315,5 @@ sm_row *prow;
     (void) fprintf(fp, " %d", p->col_num);
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/set.c b/src/misc/espresso/set.c
index e3629343..fc78f484 100644
--- a/src/misc/espresso/set.c
+++ b/src/misc/espresso/set.c
@@ -14,6 +14,9 @@
 /* LINTLIBRARY */
 
 #include "espresso.h"
+
+ABC_NAMESPACE_IMPL_START
+
 static pset_family set_family_garbage = NULL;
 
 static void intcpy(d, s, n)
@@ -818,3 +821,5 @@ register int *permute, npermute;
     sf_free(A);
     return B;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/setc.c b/src/misc/espresso/setc.c
index 64130ec5..976ff478 100644
--- a/src/misc/espresso/setc.c
+++ b/src/misc/espresso/setc.c
@@ -49,6 +49,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /* see if the cube has a full row of 1's (with respect to cof) */
 bool full_row(p, cof)
 IN register pcube p, cof;
@@ -481,3 +484,5 @@ register pset a, b;
     }
     return 0;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/sharp.c b/src/misc/espresso/sharp.c
index 53435078..25c49844 100644
--- a/src/misc/espresso/sharp.c
+++ b/src/misc/espresso/sharp.c
@@ -13,6 +13,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 long start_time;
 
 
@@ -245,3 +248,5 @@ pcover A, B;
     Tsave = sf_union(Tsave, sf_contain(T));
     return Tsave;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/sminterf.c b/src/misc/espresso/sminterf.c
index 50a6db4e..d1abe534 100644
--- a/src/misc/espresso/sminterf.c
+++ b/src/misc/espresso/sminterf.c
@@ -9,6 +9,9 @@
  */
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 pset
 do_sm_minimum_cover(A)
@@ -42,3 +45,5 @@ pset_family A;
 
     return cover;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/solution.c b/src/misc/espresso/solution.c
index 26119185..c76407de 100644
--- a/src/misc/espresso/solution.c
+++ b/src/misc/espresso/solution.c
@@ -9,6 +9,9 @@
  */
 #include "mincov_int.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 
 solution_t *
 solution_alloc()
@@ -112,3 +115,5 @@ solution_t *best1, *best2;
     }
     }
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/sparse.c b/src/misc/espresso/sparse.c
index 137ce7c1..919aeca6 100644
--- a/src/misc/espresso/sparse.c
+++ b/src/misc/espresso/sparse.c
@@ -20,6 +20,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 pcover make_sparse(F, D, R)
 pcover F, D, R;
 {
@@ -144,3 +147,5 @@ pcover F, D;
     }
     return F;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/sparse.h b/src/misc/espresso/sparse.h
index 212a32ed..9a15fc65 100644
--- a/src/misc/espresso/sparse.h
+++ b/src/misc/espresso/sparse.h
@@ -10,6 +10,10 @@
 #ifndef SPARSE_H
 #define SPARSE_H
 
+
+ABC_NAMESPACE_HEADER_START
+
+
 /*
  *  sparse.h -- sparse matrix package header file
  */
@@ -132,4 +136,8 @@ extern int sm_col_compare(), sm_col_hash();
 
 extern int sm_row_dominance(), sm_col_dominance(), sm_block_partition();
 
+
+
+ABC_NAMESPACE_HEADER_END
+
 #endif
diff --git a/src/misc/espresso/unate.c b/src/misc/espresso/unate.c
index bd71207f..f50f2a26 100644
--- a/src/misc/espresso/unate.c
+++ b/src/misc/espresso/unate.c
@@ -13,6 +13,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 static pset_family abs_covered();
 static pset_family abs_covered_many();
 static int abs_select_restricted();
@@ -439,3 +442,5 @@ pset restrict;
 
     return best_var;
 }
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/misc/espresso/util_old.h b/src/misc/espresso/util_old.h
index 5451cbe9..32be6ffa 100644
--- a/src/misc/espresso/util_old.h
+++ b/src/misc/espresso/util_old.h
@@ -240,7 +240,8 @@ extern long random();
 
 /*
 #if !defined(__osf__)
-#define MAXPATHLEN 1024
+#define MAXPATHLEN
+ 1024
 #endif
 */
 
@@ -298,4 +299,11 @@ extern char *util_optarg;
 #endif
 
 #include <varargs.h>
+
+ABC_NAMESPACE_HEADER_START
+
+
+
+ABC_NAMESPACE_HEADER_END
+
 #endif
diff --git a/src/misc/espresso/verify.c b/src/misc/espresso/verify.c
index e5340724..992e4d74 100644
--- a/src/misc/espresso/verify.c
+++ b/src/misc/espresso/verify.c
@@ -12,6 +12,9 @@
 
 #include "espresso.h"
 
+ABC_NAMESPACE_IMPL_START
+
+
 /*
  *  verify -- check that all minterms of F are contained in (Fold u Dold)
  *  and that all minterms of Fold are contained in (F u Dold).
@@ -191,3 +194,5 @@ pPLA PLA;
     (void) fflush(stdout);
     return verify_error;
 }
+ABC_NAMESPACE_IMPL_END
+