Index: factory/CMakeLists.txt
===================================================================
--- factory/CMakeLists.txt	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/CMakeLists.txt	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -165,5 +165,4 @@
   fieldGCD.cc 
   ffops.cc 
-  ffreval.cc 
   gf_tabutil.cc 
   gfops.cc 
Index: factory/DegreePattern.cc
===================================================================
--- factory/DegreePattern.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/DegreePattern.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "DegreePattern.h"
Index: factory/DegreePattern.h
===================================================================
--- factory/DegreePattern.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/DegreePattern.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -15,5 +15,5 @@
 #define DEGREE_PATTERN_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_assert.h"
Index: factory/ExtensionInfo.cc
===================================================================
--- factory/ExtensionInfo.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/ExtensionInfo.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "ExtensionInfo.h"
Index: factory/ExtensionInfo.h
===================================================================
--- factory/ExtensionInfo.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/ExtensionInfo.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -18,5 +18,5 @@
 #define EXTENSION_INFO_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/Makefile.am
===================================================================
--- factory/Makefile.am	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/Makefile.am	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -29,5 +29,4 @@
 		cf_gcd_smallp.cc \
 		cf_generator.cc \
-		cfGEval.cc \
 		cf_globals.cc \
 		cf_hnf.cc \
@@ -73,5 +72,4 @@
 		fieldGCD.cc \
 		ffops.cc \
-		ffreval.cc \
 		gf_tabutil.cc \
 		gfops.cc \
@@ -92,8 +90,8 @@
 		singext.cc \
 		parseutil.cc \
-		readcf.yy \
-		factory.h \
-		factoryconf.h \
-		ftmpl_inst.cc
+		ftmpl_inst.cc \
+		factory.h factoryconf.h cplusplus.h \
+		readcf.yy
+
 
 libfactory_a_SOURCES = $(SOURCES)
@@ -110,5 +108,4 @@
 		cf_factory.h \
 		cf_generator.h \
-		cfGEval.h \
 		cf_globals.h \
 		cf_gcd_smallp.h \
@@ -118,5 +115,5 @@
 		cf_map.h \
 		cfNewtonPolygon.h \
-                cfModResultant.h \
+		cfModResultant.h \
 		cf_primes.h \
 		cf_primetab.h \
@@ -148,5 +145,4 @@
 		fieldGCD.h \
 		ffops.h \
-		ffreval.h \
 		templates/ftmpl_list.h \
 		templates/ftmpl_matrix.h \
@@ -250,5 +246,6 @@
 	${srcdir}/bin/makeheader $< $@
 
-BUILT_SOURCES = factory.h factoryconf.h
+BUILT_SOURCES = cplusplus.h factory.h factoryconf.h
+
 
 libfactory_a_include_HEADERS=$(BUILT_SOURCES)
@@ -312,3 +309,14 @@
 		bin/makeheader bin/gen-readcf readcf.cc $(gftables_DATA)
 
-CLEANFILES = factory.h factoryconf.h
+CLEANFILES = factory.h factoryconf.h cplusplus.h
+
+
+
+EXTRA_PROGRAMS = cplusplus
+
+cplusplus_SOURCES = cplusplus.cc
+
+cplusplus.h: cplusplus
+	${builddir}/cplusplus > ${builddir}/cplusplus.h
+
+cf_gmp.h: cplusplus.h
Index: factory/NTLconvert.cc
===================================================================
--- factory/NTLconvert.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/NTLconvert.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -1,4 +1,4 @@
 /* $Id$ */
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/NTLconvert.h
===================================================================
--- factory/NTLconvert.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/NTLconvert.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -3,9 +3,7 @@
 #define INCL_NTLCONVERT_H
 
-#include <config.h>
-
 #ifdef HAVE_NTL
 
-#include "cf_gmp.h"
+// #include "cf_gmp.h"
 
 #include "cf_defs.h"
@@ -19,6 +17,6 @@
 #include "cf_algorithm.h"
 
+#include <NTL/config.h>
 
-#include <NTL/config.h>
 #ifdef NTL_STD_CXX
 #ifdef NOSTREAMIO
@@ -35,9 +33,9 @@
 #endif
 
+
 #include <NTL/ZZXFactoring.h>
 #include <NTL/ZZ_pXFactoring.h>
 #include <NTL/lzz_pXFactoring.h>
 #include <NTL/GF2XFactoring.h>
-#include "int_int.h"
 #include <NTL/ZZ_pEXFactoring.h>
 #include <NTL/lzz_pEXFactoring.h>
@@ -47,9 +45,14 @@
 #include <NTL/mat_lzz_pE.h>
 
-#include "cf_assert.h"
-
 #ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
 NTL_CLIENT
 #endif
+
+
+
+
+#include "int_int.h"
+#include "cf_assert.h"
+
 
 ZZ_pX convertFacCF2NTLZZpX(CanonicalForm f);
Index: factory/abs_fac.cc
===================================================================
--- factory/abs_fac.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/abs_fac.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -1,9 +1,12 @@
-
+#include "config.h"
 #include "canonicalform.h"
+
 #ifdef HAVE_BIFAC
-#ifndef NOSTREAMIO
-#include<fstream>
-#endif
-#include <sys/timeb.h>
+
+# ifndef NOSTREAMIO
+#  include<fstream>
+# endif
+
+# include <sys/timeb.h>
 
 
@@ -1071,3 +1074,3 @@
 
 }
-#endif
+#endif /* HAVE_BIFAC */
Index: factory/algext.h
===================================================================
--- factory/algext.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/algext.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 #define ALGEXT_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/bifac.cc
===================================================================
--- factory/bifac.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/bifac.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -1,8 +1,13 @@
+#include "config.h"
+
 #include "canonicalform.h"
+
 #ifdef HAVE_BIFAC
-#include "lgs.h"
+
+# include "lgs.h"
 #include "bifacConfig.h"
 
 #define BIFAC_BASIS_OF_G_CHECK        1
+
 void Reduce( bool );
 CanonicalForm Bigcd( const CanonicalForm& f, const CanonicalForm& g);
@@ -1292,3 +1297,3 @@
 
 // ==============  end of 'bifac.cc'  ==================
-#endif
+#endif /* #ifdef HAVE_BIFAC */
Index: factory/bifac.h
===================================================================
--- factory/bifac.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/bifac.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,7 @@
 
 #include <time.h>
-#include <factoryconf.h>
+
+// #include <factoryconf.h>
+
 #ifdef HAVE_BIFAC
 
Index: factory/canonicalform.cc
===================================================================
--- factory/canonicalform.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/canonicalform.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,8 +2,7 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
-
 #include "cf_factory.h"
 
@@ -17,8 +16,12 @@
 #include "gfops.h"
 #include "cf_binom.h"
+
 #if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
 #include "memman.h"
 #endif
 
+#include "cf_gmp.h"
+
+
 #ifndef NOSTREAMIO
 CanonicalForm readCF( ISTREAM& );
@@ -28,4 +31,5 @@
 int initializeGMP();
 int initializeCharacteristic();
+
 #ifdef SINGULAR
 extern int mmInit(void);
Index: factory/canonicalform.h
===================================================================
--- factory/canonicalform.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/canonicalform.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,16 +5,16 @@
 #define INCL_CANONICALFORM_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
-#ifdef HAVE_IOSTREAM
-#include <iostream>
-#define OSTREAM std::ostream
-#define ISTREAM std::istream
-#elif defined(HAVE_IOSTREAM_H)
-#include <iostream.h>
-#define OSTREAM ostream
-#define ISTREAM istream
-#endif
+# ifdef HAVE_IOSTREAM
+#  include <iostream>
+#  define OSTREAM std::ostream
+#  define ISTREAM std::istream
+# elif defined(HAVE_IOSTREAM_H)
+#  include <iostream.h>
+#  define OSTREAM ostream
+#  define ISTREAM istream
+# endif
 #endif /* NOSTREAMIO */
 
@@ -165,8 +165,8 @@
     // input/output
 #ifndef NOSTREAMIO
-    void print( OSTREAM&, char * ) const;
-    void print( OSTREAM& ) const;
-    friend OSTREAM& operator << ( OSTREAM&, const CanonicalForm& );
-    friend ISTREAM& operator >> ( ISTREAM&, CanonicalForm& );
+   void print( OSTREAM&, char * ) const;
+   void print( OSTREAM& ) const;
+   friend OSTREAM& operator << ( OSTREAM&, const CanonicalForm& );
+   friend ISTREAM& operator >> ( ISTREAM&, CanonicalForm& );
 #endif /* NOSTREAMIO */
 
Index: factory/cfModResultant.cc
===================================================================
--- factory/cfModResultant.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cfModResultant.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,6 +13,7 @@
 /*****************************************************************************/
 
-
-#include "assert.h"
+#include "config.h"
+
+#include "cf_assert.h"
 
 #include "cfModResultant.h"
@@ -21,4 +22,5 @@
 #include "cf_map.h"
 #include "cf_algorithm.h"
+#include "cf_iter.h"
 
 #ifdef HAVE_NTL
Index: factory/cfNewtonPolygon.cc
===================================================================
--- factory/cfNewtonPolygon.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cfNewtonPolygon.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -15,5 +15,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 #include <stdlib.h>
 
Index: factory/cfNewtonPolygon.h
===================================================================
--- factory/cfNewtonPolygon.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cfNewtonPolygon.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -18,5 +18,5 @@
 #define CF_NEWTON_POLYGON_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifdef HAVE_NTL
Index: factory/cf_algorithm.cc
===================================================================
--- factory/cf_algorithm.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_algorithm.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,5 +19,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_algorithm.h
===================================================================
--- factory/cf_algorithm.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_algorithm.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -24,5 +24,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_binom.cc
===================================================================
--- factory/cf_binom.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_binom.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_binom.h
===================================================================
--- factory/cf_binom.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_binom.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_BINOM_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_char.cc
===================================================================
--- factory/cf_char.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_char.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_chinese.cc
===================================================================
--- factory/cf_chinese.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_chinese.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -12,15 +12,16 @@
 //}}}
 
-#include <config.h>
-
-#include "cf_assert.h"
-#include "debug.h"
-
-#include "canonicalform.h"
-#include "cf_iter.h"
+#include "config.h"
 
 #ifdef HAVE_NTL
 #include "NTLconvert.h"
 #endif
+
+#include "cf_assert.h"
+#include "debug.h"
+
+#include "canonicalform.h"
+#include "cf_iter.h"
+
 
 //{{{ void chineseRemainder ( const CanonicalForm & x1, const CanonicalForm & q1, const CanonicalForm & x2, const CanonicalForm & q2, CanonicalForm & xnew, CanonicalForm & qnew )
Index: factory/cf_cyclo.cc
===================================================================
--- factory/cf_cyclo.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_cyclo.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -17,9 +17,10 @@
 //*****************************************************************************
 
-#include <config.h>
+#include "config.h"
 
 #include "canonicalform.h"
 #include "cf_primes.h"
 #include "cf_util.h"
+#include "cf_assert.h"
 
 #ifdef HAVE_NTL
Index: factory/cf_cyclo.h
===================================================================
--- factory/cf_cyclo.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_cyclo.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,5 +19,5 @@
 //*****************************************************************************
 
-#include <config.h>
+// #include "config.h"
 
 int* integerFactorizer (const long integer, int& length, bool& fail);
Index: factory/cf_defs.h
===================================================================
--- factory/cf_defs.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_defs.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_DEFS_H
 
-#include <config.h>
+// #include "config.h"
 
 /*BEGINPUBLIC*/
Index: factory/cf_eval.cc
===================================================================
--- factory/cf_eval.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_eval.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_eval.h
===================================================================
--- factory/cf_eval.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_eval.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_EVAL_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/cf_factor.cc
===================================================================
--- factory/cf_factor.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_factor.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -12,5 +12,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_factory.cc
===================================================================
--- factory/cf_factory.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_factory.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_factory.h
===================================================================
--- factory/cf_factory.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_factory.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,9 +5,10 @@
 #define INCL_CF_FACTORY_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_defs.h"
 #include "variable.h"
-#include "cf_gmp.h"
+
+#include <factory/cf_gmp.h>
 
 class InternalCF;
@@ -34,4 +35,5 @@
 };
 
+
 MP_INT getmpi ( InternalCF * value, bool symmetric = true );
 
Index: factory/cf_gcd.cc
===================================================================
--- factory/cf_gcd.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_gcd.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_gcd_smallp.cc
===================================================================
--- factory/cf_gcd_smallp.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_gcd_smallp.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,5 +19,5 @@
 //*****************************************************************************
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_gcd_smallp.h
===================================================================
--- factory/cf_gcd_smallp.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_gcd_smallp.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -23,5 +23,5 @@
 //*****************************************************************************
 
-#include <config.h>
+// #include "config.h"
 #include "cf_assert.h"
 
Index: factory/cf_generator.cc
===================================================================
--- factory/cf_generator.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_generator.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_generator.h
===================================================================
--- factory/cf_generator.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_generator.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_GENERATOR_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_globals.cc
===================================================================
--- factory/cf_globals.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_globals.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -10,5 +10,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_switches.h"
Index: factory/cf_globals.h
===================================================================
--- factory/cf_globals.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_globals.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_switches.h"
Index: factory/cf_gmp.h
===================================================================
--- factory/cf_gmp.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_gmp.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -4,10 +4,12 @@
 
 #ifdef __cplusplus
-  #define __cplusplus_backup __cplusplus
+//  #define __cplusplus_backup __cplusplus
   #undef __cplusplus
-  extern "C" {
-  #include <gmp.h>
+  extern "C" 
+  {
+    #include <gmp.h>
   }
-  #define __cplusplus __cplusplus_backup
+  #include <factory/cplusplus.h>
+//  #define __cplusplus __cplusplus_backup
 #else
   #include <gmp.h>
Index: factory/cf_inline.cc
===================================================================
--- factory/cf_inline.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_inline.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -75,5 +75,5 @@
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_irred.cc
===================================================================
--- factory/cf_irred.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_irred.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_irred.h
===================================================================
--- factory/cf_irred.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_irred.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_IRRED_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_iter.cc
===================================================================
--- factory/cf_iter.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_iter.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_iter.h
===================================================================
--- factory/cf_iter.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_iter.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_ITER_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_iter_inline.cc
===================================================================
--- factory/cf_iter_inline.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_iter_inline.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -22,5 +22,5 @@
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_linsys.cc
===================================================================
--- factory/cf_linsys.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_linsys.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_map.cc
===================================================================
--- factory/cf_map.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_map.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -10,5 +10,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_map.h
===================================================================
--- factory/cf_map.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_map.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/cf_map_ext.cc
===================================================================
--- factory/cf_map_ext.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_map_ext.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -17,5 +17,5 @@
 //*****************************************************************************
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_map_ext.h
===================================================================
--- factory/cf_map_ext.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_map_ext.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,5 +19,5 @@
 //*****************************************************************************
 
-#include <config.h>
+// #include "config.h"
 
 int findItem (const CFList& list, const CanonicalForm& item);
Index: factory/cf_ops.cc
===================================================================
--- factory/cf_ops.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_ops.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -20,5 +20,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_primes.cc
===================================================================
--- factory/cf_primes.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_primes.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_primes.h
===================================================================
--- factory/cf_primes.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_primes.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_PRIMES_H
 
-#include <config.h>
+// #include "config.h"
 
 /*BEGINPUBLIC*/
Index: factory/cf_primetab.cc
===================================================================
--- factory/cf_primetab.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_primetab.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -15,5 +15,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_primes.h"
Index: factory/cf_primetab.h
===================================================================
--- factory/cf_primetab.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_primetab.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_PRIMETAB_H
 
-#include <config.h>
+// #include "config.h"
 
 #define NUMSMALLPRIMES 3511
Index: factory/cf_random.cc
===================================================================
--- factory/cf_random.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_random.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include <time.h>
Index: factory/cf_random.h
===================================================================
--- factory/cf_random.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_random.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_RANDOM_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_resultant.cc
===================================================================
--- factory/cf_resultant.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_resultant.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -10,5 +10,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_reval.cc
===================================================================
--- factory/cf_reval.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_reval.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -4,5 +4,5 @@
 #define MORE_ZEROES
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/cf_reval.h
===================================================================
--- factory/cf_reval.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_reval.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_CF_REVAL_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/cf_switches.cc
===================================================================
--- factory/cf_switches.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_switches.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -10,5 +10,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_switches.h"
Index: factory/cf_switches.h
===================================================================
--- factory/cf_switches.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_switches.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 //{{{ const int CFSwitchesMax
Index: factory/cf_util.cc
===================================================================
--- factory/cf_util.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_util.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 //{{{ int ipower ( int b, int m )
Index: factory/cf_util.h
===================================================================
--- factory/cf_util.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/cf_util.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 int ipower ( int b, int n );
Index: factory/configure.ac
===================================================================
--- factory/configure.ac	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/configure.ac	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -16,5 +16,4 @@
 AC_CONFIG_SRCDIR(canonicalform.cc)
 AC_CONFIG_MACRO_DIR([../m4])
-AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR([.])
 AM_MAINTAINER_MODE
@@ -37,4 +36,11 @@
 #
 AC_ARG_WITH(
+  Singular,
+  [AS_HELP_STRING([--without-Singular],[build NOT for the use with CAS Singular.])],
+  ,
+  [with_Singular=yes])
+
+
+AC_ARG_WITH(
   memman,
   [  --with-memman(=<memman>) specify Factory memory manager.
@@ -51,28 +57,18 @@
 AC_ARG_WITH(
   omalloc,
-  [  --with-omalloc           build for use with omalloc])
-
-AC_ARG_WITH(
-  Singular,
-  [  --with-Singular         build for use with computer algebra system Singular.],
-  ,
-  with_Singular=no)
+  [AS_HELP_STRING([--with-omalloc],[build for use with omalloc])])
+
 
 AC_ARG_ENABLE(
   cf-inline,
-  [  --enable-cf-inline      build Factory with \"configurable inline methods\"
-                          enabled.],
-  ,
-  enable_cf_inline=no)
+  [AS_HELP_STRING([--enable-cf-inline],[build Factory with \"configurable inline methods\" enabled.])],
+  [enable_cf_inline=$enableval],
+  [enable_cf_inline=no])
 
 AC_ARG_ENABLE(
   streamio,
-  [  --disable-streamio      build Factory without stream IO],
-  ,
-  [ if test "x$with_Singular" = xyes; then
-      enable_streamio=no
-    else
-      enable_streamio=yes
-    fi ])
+  [AS_HELP_STRING([--enable-streamio],[build Factory with stream IO])],
+  ,
+  [enable_streamio=no])
 
 AC_ARG_ENABLE(
@@ -86,5 +82,5 @@
 AC_ARG_ENABLE(
   assertions,
-  [  --enable-assertions     build Factory with assertions activated],
+  [AS_HELP_STRING([--enable-assertions],[build Factory with assertions activated])],
   ,
   enable_assertions=no)
@@ -92,5 +88,5 @@
 AC_ARG_ENABLE(
   timing,
-  [  --enable-timing         build Factory so it will print timing information],
+  [AS_HELP_STRING([--enable-timing],[build Factory so it will print timing information])],
   ,
   enable_timing=no)
@@ -98,5 +94,5 @@
 AC_ARG_ENABLE(
   debugoutput,
-  [  --enable-debugoutput    build Factory so it will print debugging information],
+  [AS_HELP_STRING([--enable-debugoutput],[build Factory so it will print debugging information])],
   ,
   enable_debugoutput=no)
@@ -470,3 +466,4 @@
 AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir", [GFTABLEDIR])
 
+AC_CONFIG_HEADER(config.h)
 AC_OUTPUT(Makefile ftest/GNUmakefile)
Index: factory/facAlgExt.cc
===================================================================
--- factory/facAlgExt.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facAlgExt.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -18,5 +18,5 @@
 //*****************************************************************************
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/facBivar.cc
===================================================================
--- factory/facBivar.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facBivar.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "assert.h"
Index: factory/facBivar.h
===================================================================
--- factory/facBivar.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facBivar.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -16,5 +16,5 @@
 #define FAC_BIVAR_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "assert.h"
Index: factory/facFactorize.cc
===================================================================
--- factory/facFactorize.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFactorize.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "assert.h"
Index: factory/facFactorize.h
===================================================================
--- factory/facFactorize.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFactorize.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -16,5 +16,5 @@
 #define FAC_FACTORIZE_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "facBivar.h"
Index: factory/facFqBivar.cc
===================================================================
--- factory/facFqBivar.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqBivar.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,5 +19,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/facFqBivar.h
===================================================================
--- factory/facFqBivar.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqBivar.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -17,5 +17,5 @@
 #define FAC_FQ_BIVAR_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_assert.h"
Index: factory/facFqBivarUtil.cc
===================================================================
--- factory/facFqBivarUtil.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqBivarUtil.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_map.h"
Index: factory/facFqBivarUtil.h
===================================================================
--- factory/facFqBivarUtil.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqBivarUtil.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -16,5 +16,5 @@
 #define FAC_FQ_BIVAR_UTIL_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_map.h"
Index: factory/facFqFactorize.cc
===================================================================
--- factory/facFqFactorize.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqFactorize.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -18,5 +18,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/facFqFactorize.h
===================================================================
--- factory/facFqFactorize.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqFactorize.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -17,5 +17,5 @@
 #define FAC_FQ_FACTORIZE_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "facFqBivar.h"
Index: factory/facFqFactorizeUtil.cc
===================================================================
--- factory/facFqFactorizeUtil.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqFactorizeUtil.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "canonicalform.h"
Index: factory/facFqFactorizeUtil.h
===================================================================
--- factory/facFqFactorizeUtil.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqFactorizeUtil.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -16,5 +16,5 @@
 #define FAC_FQ_FACTORIZE_UTIL_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/facFqSquarefree.cc
===================================================================
--- factory/facFqSquarefree.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facFqSquarefree.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -15,5 +15,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 
 #include "canonicalform.h"
Index: factory/facHensel.cc
===================================================================
--- factory/facHensel.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facHensel.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,4 +19,6 @@
  **/
 /*****************************************************************************/
+
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/facHensel.h
===================================================================
--- factory/facHensel.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facHensel.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -19,5 +19,5 @@
 #define FAC_HENSEL_H
 
-#include <config.h>
+// #include "config.h"
 #include "cf_assert.h"
 #include "debug.h"
Index: factory/facIrredTest.cc
===================================================================
--- factory/facIrredTest.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facIrredTest.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -14,5 +14,5 @@
 /*****************************************************************************/
 
-#include <config.h>
+#include "config.h"
 #include <math.h>
 
Index: factory/facIrredTest.h
===================================================================
--- factory/facIrredTest.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/facIrredTest.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -20,5 +20,5 @@
 #define FAC_IRRED_TEST_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/fac_berlekamp.cc
===================================================================
--- factory/fac_berlekamp.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_berlekamp.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_berlekamp.h
===================================================================
--- factory/fac_berlekamp.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_berlekamp.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_BERLEKAMP_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/fac_cantzass.cc
===================================================================
--- factory/fac_cantzass.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_cantzass.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_cantzass.h
===================================================================
--- factory/fac_cantzass.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_cantzass.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_CANTZASS_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "variable.h"
Index: factory/fac_distrib.cc
===================================================================
--- factory/fac_distrib.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_distrib.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_distrib.h
===================================================================
--- factory/fac_distrib.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_distrib.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_DISTRIB_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/fac_ezgcd.cc
===================================================================
--- factory/fac_ezgcd.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_ezgcd.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_iterfor.cc
===================================================================
--- factory/fac_iterfor.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_iterfor.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_iterfor.h
===================================================================
--- factory/fac_iterfor.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_iterfor.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_ITERFOR_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/fac_multihensel.cc
===================================================================
--- factory/fac_multihensel.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_multihensel.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_multivar.cc
===================================================================
--- factory/fac_multivar.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_multivar.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_multivar.h
===================================================================
--- factory/fac_multivar.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_multivar.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_MULTIVAR_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/fac_sqrfree.cc
===================================================================
--- factory/fac_sqrfree.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_sqrfree.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_sqrfree.h
===================================================================
--- factory/fac_sqrfree.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_sqrfree.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_SQRFREE_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/fac_univar.cc
===================================================================
--- factory/fac_univar.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_univar.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
Index: factory/fac_univar.h
===================================================================
--- factory/fac_univar.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_univar.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_UNIVAR_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/fac_util.cc
===================================================================
--- factory/fac_util.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_util.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/fac_util.h
===================================================================
--- factory/fac_util.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fac_util.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FAC_UTIL_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/factory.template
===================================================================
--- factory/factory.template	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/factory.template	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -22,5 +22,5 @@
 //}}}
 
-#include <factory/factoryconf.h>
+// #include <factory/factoryconf.h>
 
 #ifndef NOSTREAMIO
@@ -36,5 +36,5 @@
 #endif /* ! NOSTREAMIO */
 
-#  include <factory/cf_gmp.h>
+#include <factory/cf_gmp.h>
 
 #include <factory/templates/ftmpl_array.h>
Index: factory/ffops.cc
===================================================================
--- factory/ffops.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/ffops.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
Index: factory/ffops.h
===================================================================
--- factory/ffops.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/ffops.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FFOPS_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_globals.h"
Index: factory/fieldGCD.cc
===================================================================
--- factory/fieldGCD.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/fieldGCD.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <config.h>
+#include "config.h"
 #ifndef NOSTREAMIO
 #ifdef HAVE_IOSTREAM
Index: factory/ftmpl_inst.cc
===================================================================
--- factory/ftmpl_inst.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/ftmpl_inst.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -12,13 +12,15 @@
 //}}}
 
-#include <factoryconf.h>
+#include "config.h"
 
-#include <templates/ftmpl_array.cc>
-#include <templates/ftmpl_factor.cc>
-#include <templates/ftmpl_list.cc>
-#include <templates/ftmpl_functions.h>
-#include <templates/ftmpl_matrix.cc>
+#include "factoryconf.h"
 
-#include <factory.h>
+#include "templates/ftmpl_array.cc"
+#include "templates/ftmpl_factor.cc"
+#include "templates/ftmpl_list.cc"
+#include "templates/ftmpl_functions.h"
+#include "templates/ftmpl_matrix.cc"
+
+#include "factory.h"
 
 
Index: factory/gf_tabutil.cc
===================================================================
--- factory/gf_tabutil.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/gf_tabutil.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/gf_tabutil.h
===================================================================
--- factory/gf_tabutil.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/gf_tabutil.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_GF_TABUTIL_H
 
-#include <config.h>
+// #include "config.h"
 
 int gf_tab_numdigits62 ( int q );
Index: factory/gfops.cc
===================================================================
--- factory/gfops.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/gfops.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_CSTDIO
Index: factory/gfops.h
===================================================================
--- factory/gfops.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/gfops.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_GFOPS_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/gmpext.h
===================================================================
--- factory/gmpext.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/gmpext.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,7 +5,6 @@
 #define INCL_GMPEXT_H
 
-#include <config.h>
-
-#include "cf_gmp.h"
+// #include "config.h"
+// #include "cf_gmp.h"
 
 #include "cf_defs.h"
Index: factory/imm.cc
===================================================================
--- factory/imm.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/imm.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "imm.h"
Index: factory/imm.h
===================================================================
--- factory/imm.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/imm.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_IMM_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/initgmp.cc
===================================================================
--- factory/initgmp.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/initgmp.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/int_cf.cc
===================================================================
--- factory/int_cf.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_cf.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/int_cf.h
===================================================================
--- factory/int_cf.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_cf.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_INT_CF_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/int_int.cc
===================================================================
--- factory/int_int.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_int.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "canonicalform.h"
Index: factory/int_int.h
===================================================================
--- factory/int_int.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_int.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_INT_INT_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
@@ -20,5 +20,5 @@
 
 #include "int_cf.h"
-#include "cf_gmp.h"
+// #include "cf_gmp.h"
 #include "gmpext.h"
 
Index: factory/int_intdiv.cc
===================================================================
--- factory/int_intdiv.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_intdiv.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -8,5 +8,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "canonicalform.h"
Index: factory/int_poly.cc
===================================================================
--- factory/int_poly.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_poly.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/int_poly.h
===================================================================
--- factory/int_poly.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_poly.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_INT_POLY_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
Index: factory/int_pp.cc
===================================================================
--- factory/int_pp.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_pp.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/int_pp.h
===================================================================
--- factory/int_pp.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_pp.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,7 +5,7 @@
 #define INCL_INT_PP_H
 
-#include <config.h>
+// #include "config.h"
 
-#include "cf_gmp.h"
+#include <factory/cf_gmp.h>
 
 #ifndef NOSTREAMIO
Index: factory/int_rat.cc
===================================================================
--- factory/int_rat.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_rat.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/int_rat.h
===================================================================
--- factory/int_rat.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/int_rat.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_INT_RAT_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
@@ -22,5 +22,5 @@
 #include "int_cf.h"
 #include "imm.h"
-#include "cf_gmp.h"
+// #include "cf_gmp.h"
 
 class InternalRational : public InternalCF
Index: factory/lgs.cc
===================================================================
--- factory/lgs.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/lgs.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,4 +2,5 @@
     Dateiname:          lgs.cc
    =================================================================== */
+#include "config.h"
 
 #include "lgs.h"
@@ -307,3 +308,4 @@
   return erg;
 }
-#endif
+#endif /* #ifdef HAVE_BIFAC */
+
Index: factory/memman.h
===================================================================
--- factory/memman.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/memman.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_MEMMAN_H
 
-#include <config.h>
+// #include "config.h"
 
 #include <stdlib.h>
Index: factory/memutil.h
===================================================================
--- factory/memutil.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/memutil.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -7,5 +7,5 @@
 #define _POSIX_SOURCE 1
 
-#include <config.h>
+// #include "config.h"
 
 #include <stdlib.h>
Index: factory/mmprivate.h
===================================================================
--- factory/mmprivate.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/mmprivate.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_MMPRIVATE_H
 
-#include <config.h>
+// #include "config.h"
 
 #define MAXDATA 4000
Index: factory/newdelete.cc
===================================================================
--- factory/newdelete.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/newdelete.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 #include <new>
 
Index: factory/parseutil.cc
===================================================================
--- factory/parseutil.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/parseutil.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
Index: factory/parseutil.h
===================================================================
--- factory/parseutil.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/parseutil.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_PARSEUTIL_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "cf_defs.h"
Index: factory/readcf.yy
===================================================================
--- factory/readcf.yy	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/readcf.yy	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -3,4 +3,5 @@
 
 %{
+#ifndef NOSTREAMIO
 
 #if defined(WINNT) && ! defined(__GNUC__)
@@ -210,2 +211,6 @@
     return buffer;
 }
+
+
+#endif
+// #ifndef NOSTREAMIO
Index: factory/singext.cc
===================================================================
--- factory/singext.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/singext.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/singext.h
===================================================================
--- factory/singext.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/singext.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,8 +5,8 @@
 #define INCL_SINGEXT_H
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
-#include "cf_gmp.h"
+#include <factory/cf_gmp.h>
 
 /*BEGINPUBLIC*/
Index: factory/sm_sparsemod.cc
===================================================================
--- factory/sm_sparsemod.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/sm_sparsemod.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -12,5 +12,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/sm_sparsemod.h
===================================================================
--- factory/sm_sparsemod.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/sm_sparsemod.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/sm_util.cc
===================================================================
--- factory/sm_util.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/sm_util.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -12,5 +12,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/sm_util.h
===================================================================
--- factory/sm_util.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/sm_util.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -13,5 +13,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 #include "canonicalform.h"
Index: factory/templates/ftmpl_array.h
===================================================================
--- factory/templates/ftmpl_array.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/templates/ftmpl_array.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_ARRAY_H
 
-#include <factory/factoryconf.h>
+// #include <factory/factoryconf.h>
 
 #ifndef NOSTREAMIO
Index: factory/templates/ftmpl_factor.h
===================================================================
--- factory/templates/ftmpl_factor.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/templates/ftmpl_factor.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_FACTOR_H
 
-#include <factory/factoryconf.h>
+// #include <factory/factoryconf.h>
 
 #ifndef NOSTREAMIO
Index: factory/templates/ftmpl_functions.h
===================================================================
--- factory/templates/ftmpl_functions.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/templates/ftmpl_functions.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -27,5 +27,5 @@
 //}}}
 
-#include <factory/factoryconf.h>
+// #include <factory/factoryconf.h>
 
 //{{{ template <class T> inline T tmax ( const T & a, const T & b )
Index: factory/templates/ftmpl_list.h
===================================================================
--- factory/templates/ftmpl_list.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/templates/ftmpl_list.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_LIST_H
 
-#include <factory/factoryconf.h>
+// #include <factory/factoryconf.h>
 
 #ifndef NOSTREAMIO
Index: factory/templates/ftmpl_matrix.h
===================================================================
--- factory/templates/ftmpl_matrix.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/templates/ftmpl_matrix.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,5 +5,5 @@
 #define INCL_MATRIX_H
 
-#include <factory/factoryconf.h>
+// #include <factory/factoryconf.h>
 
 #ifndef NOSTREAMIO
Index: factory/var_intglobal.cc
===================================================================
--- factory/var_intglobal.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/var_intglobal.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -15,5 +15,5 @@
 //}}}
 
-#include <config.h>
+#include "config.h"
 
 #include "cf_assert.h"
Index: factory/var_intglobal.h
===================================================================
--- factory/var_intglobal.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/var_intglobal.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -11,5 +11,5 @@
 //}}}
 
-#include <config.h>
+// #include "config.h"
 
 class Prim;
Index: factory/variable.cc
===================================================================
--- factory/variable.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/variable.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,5 +2,5 @@
 /* $Id$ */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
Index: factory/variable.h
===================================================================
--- factory/variable.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/variable.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -5,14 +5,14 @@
 #define INCL_VARIABLE_H
 
-#include <config.h>
+// #include "config.h"
 
 #ifndef NOSTREAMIO
-#ifdef HAVE_IOSTREAM
-#include <iostream>
-#define OSTREAM std::ostream
-#elif defined(HAVE_IOSTREAM_H)
-#include <iostream.h>
-#define OSTREAM ostream
-#endif
+# ifdef HAVE_IOSTREAM
+#  include <iostream>
+#  define OSTREAM std::ostream
+# elif defined(HAVE_IOSTREAM_H)
+#  include <iostream.h>
+#  define OSTREAM ostream
+# endif
 #endif /* NOSTREAMIO */
 
@@ -69,5 +69,5 @@
     }
 #ifndef NOSTREAMIO
-    friend OSTREAM & operator << ( OSTREAM & os, const Variable & v );
+   friend OSTREAM & operator << ( OSTREAM & os, const Variable & v );
 #endif /* NOSTREAMIO */
     friend void swap_levels();
Index: factory/winnt/factory.h
===================================================================
--- factory/winnt/factory.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ factory/winnt/factory.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -23,5 +23,5 @@
 //}}}
 
-#include <factoryconf.h>
+// #include <factoryconf.h>
 
 #ifndef NOSTREAMIO
@@ -37,9 +37,10 @@
 #endif /* ! NOSTREAMIO */
 
-#ifdef SINGULAR
-#include "cf_gmp.h"
-#else
-#include <gmp.h>
-#endif /* SINGULAR */
+
+// #ifdef SINGULAR
+// #include "cf_gmp.h"
+// #else
+// #include <gmp.h>
+// #endif /* SINGULAR */
 
 #include <templates/ftmpl_array.h>
Index: kernel/test.cc
===================================================================
--- kernel/test.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ kernel/test.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -52,4 +52,5 @@
 #ifdef HAVE_FACTORY
 int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
+int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
 #endif
 
Index: libpolys/coeffs/si_gmp.h
===================================================================
--- libpolys/coeffs/si_gmp.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ libpolys/coeffs/si_gmp.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -2,4 +2,10 @@
 #define COEFFS_SI_GMP_H
 
+
+// just assume that factory have been built (cplusplus.h!)
+// instead of duplicating cf_gmp.h here for now...
+#include <factory/cf_gmp.h>
+
+/*
 #if defined(__cplusplus) && defined(__GNUC__)
   #define __cplusplus_backup __cplusplus
@@ -12,4 +18,5 @@
   #include <gmp.h>
 #endif
+*/
 
 
Index: libpolys/coeffs/test.cc
===================================================================
--- libpolys/coeffs/test.cc	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ libpolys/coeffs/test.cc	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -26,5 +26,6 @@
 
 #ifdef HAVE_FACTORY
-int initializeGMP(){ return 1; }
+int initializeGMP(void){ return 1; }
+int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
 #endif
 
Index: libpolys/tests/common.h
===================================================================
--- libpolys/tests/common.h	(revision fbb01737147ed8f605c88489320c73e975833f32)
+++ libpolys/tests/common.h	(revision e4fe2b40ac408d4d74d81461cc23af8a30ddc204)
@@ -20,4 +20,5 @@
 #ifdef HAVE_FACTORY
 int initializeGMP(){ return 1; }
+int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
 #endif
 
