Index: factory/DegreePattern.cc
===================================================================
--- factory/DegreePattern.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/DegreePattern.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "DegreePattern.h"
Index: factory/ExtensionInfo.cc
===================================================================
--- factory/ExtensionInfo.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/ExtensionInfo.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "ExtensionInfo.h"
Index: factory/FLINTconvert.cc
===================================================================
--- factory/FLINTconvert.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/FLINTconvert.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -13,5 +13,7 @@
 
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/NTLconvert.cc
===================================================================
--- factory/NTLconvert.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/NTLconvert.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,3 +1,5 @@
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/algext.cc
===================================================================
--- factory/algext.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/algext.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,3 +1,5 @@
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifndef NOSTREAMIO
Index: factory/canonicalform.cc
===================================================================
--- factory/canonicalform.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/canonicalform.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cfModResultant.cc
===================================================================
--- factory/cfModResultant.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cfModResultant.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cfNewtonPolygon.cc
===================================================================
--- factory/cfNewtonPolygon.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cfNewtonPolygon.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -12,5 +12,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_algorithm.cc
===================================================================
--- factory/cf_algorithm.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_algorithm.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -18,5 +18,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_binom.cc
===================================================================
--- factory/cf_binom.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_binom.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_char.cc
===================================================================
--- factory/cf_char.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_char.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_chinese.cc
===================================================================
--- factory/cf_chinese.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_chinese.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_NTL
Index: factory/cf_cyclo.cc
===================================================================
--- factory/cf_cyclo.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_cyclo.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -14,5 +14,7 @@
 //*****************************************************************************
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/cf_eval.cc
===================================================================
--- factory/cf_eval.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_eval.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_factor.cc
===================================================================
--- factory/cf_factor.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_factor.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_factory.cc
===================================================================
--- factory/cf_factory.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_factory.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_gcd.cc
===================================================================
--- factory/cf_gcd.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_gcd.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "timing.h"
Index: factory/cf_gcd_smallp.cc
===================================================================
--- factory/cf_gcd_smallp.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_gcd_smallp.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -16,5 +16,7 @@
 //*****************************************************************************
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_generator.cc
===================================================================
--- factory/cf_generator.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_generator.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_globals.cc
===================================================================
--- factory/cf_globals.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_globals.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -9,5 +9,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_switches.h"
Index: factory/cf_hnf.cc
===================================================================
--- factory/cf_hnf.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_hnf.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -9,5 +9,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_NTL
Index: factory/cf_inline.cc
===================================================================
--- factory/cf_inline.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_inline.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -74,5 +74,7 @@
 #endif
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_irred.cc
===================================================================
--- factory/cf_irred.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_irred.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_iter.cc
===================================================================
--- factory/cf_iter.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_iter.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_iter_inline.cc
===================================================================
--- factory/cf_iter_inline.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_iter_inline.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -21,5 +21,7 @@
 #endif
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_linsys.cc
===================================================================
--- factory/cf_linsys.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_linsys.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_map.cc
===================================================================
--- factory/cf_map.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_map.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -9,5 +9,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/cf_map_ext.cc
===================================================================
--- factory/cf_map_ext.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_map_ext.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -14,5 +14,7 @@
 //*****************************************************************************
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_ops.cc
===================================================================
--- factory/cf_ops.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_ops.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -19,5 +19,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_primes.cc
===================================================================
--- factory/cf_primes.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_primes.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_primetab.cc
===================================================================
--- factory/cf_primetab.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_primetab.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -14,5 +14,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_primes.h"
Index: factory/cf_random.cc
===================================================================
--- factory/cf_random.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_random.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <time.h>
Index: factory/cf_resultant.cc
===================================================================
--- factory/cf_resultant.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_resultant.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -9,5 +9,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_reval.cc
===================================================================
--- factory/cf_reval.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_reval.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -3,5 +3,7 @@
 #define MORE_ZEROES
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/cf_switches.cc
===================================================================
--- factory/cf_switches.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_switches.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -9,5 +9,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_switches.h"
Index: factory/cf_util.cc
===================================================================
--- factory/cf_util.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/cf_util.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -10,5 +10,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 //{{{ int ipower ( int b, int m )
Index: factory/facAbsFact.cc
===================================================================
--- factory/facAbsFact.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facAbsFact.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -9,5 +9,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "timing.h"
Index: factory/facAlgExt.cc
===================================================================
--- factory/facAlgExt.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facAlgExt.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -15,5 +15,7 @@
 //*****************************************************************************
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/facBivar.cc
===================================================================
--- factory/facBivar.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facBivar.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/facFactorize.cc
===================================================================
--- factory/facFactorize.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facFactorize.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "assert.h"
Index: factory/facFqBivar.cc
===================================================================
--- factory/facFqBivar.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facFqBivar.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -17,5 +17,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/facFqBivarUtil.cc
===================================================================
--- factory/facFqBivarUtil.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facFqBivarUtil.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "timing.h"
Index: factory/facFqFactorize.cc
===================================================================
--- factory/facFqFactorize.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facFqFactorize.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -16,5 +16,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/facFqFactorizeUtil.cc
===================================================================
--- factory/facFqFactorizeUtil.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facFqFactorizeUtil.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/facFqSquarefree.cc
===================================================================
--- factory/facFqSquarefree.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facFqSquarefree.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -13,5 +13,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/facHensel.cc
===================================================================
--- factory/facHensel.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facHensel.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -14,5 +14,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/facIrredTest.cc
===================================================================
--- factory/facIrredTest.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facIrredTest.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -12,5 +12,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 #include <math.h>
 
Index: factory/facMul.cc
===================================================================
--- factory/facMul.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facMul.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -13,5 +13,7 @@
 
 #include "debug.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/facNTLzzpEXGCD.cc
===================================================================
--- factory/facNTLzzpEXGCD.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facNTLzzpEXGCD.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -84,5 +84,7 @@
 
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "facNTLzzpEXGCD.h"
Index: factory/facSparseHensel.cc
===================================================================
--- factory/facSparseHensel.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/facSparseHensel.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -14,5 +14,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 #include "cf_assert.h"
 #include "facSparseHensel.h"
Index: factory/fac_berlekamp.cc
===================================================================
--- factory/fac_berlekamp.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_berlekamp.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_cantzass.cc
===================================================================
--- factory/fac_cantzass.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_cantzass.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_distrib.cc
===================================================================
--- factory/fac_distrib.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_distrib.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_ezgcd.cc
===================================================================
--- factory/fac_ezgcd.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_ezgcd.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -13,5 +13,7 @@
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "timing.h"
Index: factory/fac_iterfor.cc
===================================================================
--- factory/fac_iterfor.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_iterfor.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_multihensel.cc
===================================================================
--- factory/fac_multihensel.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_multihensel.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_multivar.cc
===================================================================
--- factory/fac_multivar.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_multivar.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_sqrfree.cc
===================================================================
--- factory/fac_sqrfree.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_sqrfree.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/fac_univar.cc
===================================================================
--- factory/fac_univar.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_univar.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <math.h>
Index: factory/fac_util.cc
===================================================================
--- factory/fac_util.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/fac_util.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/ffops.cc
===================================================================
--- factory/ffops.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/ffops.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <string.h>
Index: factory/ftmpl_inst.cc
===================================================================
--- factory/ftmpl_inst.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/ftmpl_inst.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -11,5 +11,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 // #include <factory/factoryconf.h>
Index: factory/gengftables-conway.cc
===================================================================
--- factory/gengftables-conway.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/gengftables-conway.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -10,5 +10,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_IOSTREAM
Index: factory/gengftables.cc
===================================================================
--- factory/gengftables.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/gengftables.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -10,5 +10,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_IOSTREAM
Index: factory/gf_tabutil.cc
===================================================================
--- factory/gf_tabutil.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/gf_tabutil.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/gfops.cc
===================================================================
--- factory/gfops.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/gfops.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_CSTDIO
Index: factory/imm.cc
===================================================================
--- factory/imm.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/imm.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -10,5 +10,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "imm.h"
Index: factory/int_cf.cc
===================================================================
--- factory/int_cf.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/int_cf.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/int_int.cc
===================================================================
--- factory/int_int.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/int_int.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/int_intdiv.cc
===================================================================
--- factory/int_intdiv.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/int_intdiv.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -7,5 +7,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "canonicalform.h"
Index: factory/int_poly.cc
===================================================================
--- factory/int_poly.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/int_poly.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifndef NOSTREAMIO
Index: factory/int_pp.cc
===================================================================
--- factory/int_pp.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/int_pp.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/int_rat.cc
===================================================================
--- factory/int_rat.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/int_rat.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/libfac/factor/tmpl_inst.cc
===================================================================
--- factory/libfac/factor/tmpl_inst.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/libfac/factor/tmpl_inst.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -3,5 +3,7 @@
 ////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 // #include <factory/factoryconf.h>
Index: factory/parseutil.cc
===================================================================
--- factory/parseutil.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/parseutil.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <string.h>
Index: factory/readcf.yy
===================================================================
--- factory/readcf.yy	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/readcf.yy	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -3,5 +3,7 @@
 %{
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 #include <factory/factoryconf.h>
 
@@ -13,5 +15,7 @@
 
 #include <cstring> // we need this for gcc 4.3
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #include <ctype.h>
Index: factory/singext.cc
===================================================================
--- factory/singext.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/singext.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/var_intglobal.cc
===================================================================
--- factory/var_intglobal.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/var_intglobal.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -14,5 +14,7 @@
 //}}}
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "cf_assert.h"
Index: factory/variable.cc
===================================================================
--- factory/variable.cc	(revision b5c26ceea134a59045fa059dc743890650cc31af)
+++ factory/variable.cc	(revision 16f511afd4aa6b9ce29c1da0d049c151df5bc2b5)
@@ -1,5 +1,7 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <string.h>
