diff --git a/ChangeLog b/ChangeLog
index 553dbab27..3d05dfb2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-23 Holger Vogt
+ * upload of /frontend/compatmode.c, compatmode.h  /misc/hash.c, hash.h
+   failed.
+ * xpressn.c: contaents of compatmode.c and compatmode.h added as a 
+   preliminary solution.
+ * misc/makefile.am: hash.c, mempool.c removed again
+ * forntend/makefile.am: compatmode.c removed again
+ 
 2009-08-23 Holger Vogt
  * /frontend/compatmode.c, compatmode.h  /misc/hash.c, hash.h,
    --> new .measurement code
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index 708120d51..4306baf69 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -95,8 +95,6 @@ libfte_la_SOURCES = \
 	breakp2.h	\
 	circuits.c	\
 	circuits.h	\
-	compatmode.c	\
-	compatmode.h	\
 	cpitf.c		\
 	cpitf.h		\
 	define.c	\
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index ccd3f70e8..281c0d06f 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -9,11 +9,37 @@
 #include "general.h"
 #include "numparam.h"
 #include "ngspice.h"
-#include "../compatmode.h"
+
+/* preliminary, until upload problem h_vogt is solved */
+//#include "../compatmode.h"
+#include "cpdefs.h"
+#include "ftedefs.h"
+#include "dvec.h"
+#include "../frontend/variable.h"
+/* end preliminary */
 
 /* random numbers in /maths/misc/randnumb.c */
 extern double gauss();
 
+/* preliminary until upload problem h_vogt is solved */
+typedef enum {
+  COMPATMODE_NATIVE = 0,
+  COMPATMODE_HSPICE = 1
+} COMPATMODE_T ;
+
+
+COMPATMODE_T ngpsice_compat_mode(void)
+{
+    char behaviour[80] ;
+
+    if( cp_getvar("ngbehavior", VT_STRING, behaviour)){
+      if (strcasecmp(behaviour,"hspice")==0)
+	return( COMPATMODE_HSPICE ) ;
+    }
+    return(COMPATMODE_NATIVE) ;
+} /* end ngspice_compat_mode() */
+/* end preliminary */
+
 /************ keywords ************/
 
 /* SJB - 150 chars is ample for this - see initkeys() */
diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
index bcfe4cb68..068f1f1d2 100644
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -11,12 +11,8 @@ libmisc_la_SOURCES = \
 		alloc.h		\
 		dup2.c		\
 		dup2.h		\
-		hash.h		\
-		hash.c		\
 		ivars.c		\
 		ivars.h		\
-		mempool.c	\
-		mempool.h	\
 		mktemp.c	\
 		mktemp.h	\
 		printnum.c	\
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index f216ab314..f7c7b2d79 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -819,10 +819,6 @@
 				RelativePath="..\src\frontend\commands.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\compatmode.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parser\complete.h"
 				>
@@ -1108,11 +1104,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\frontend\plotting\grid.h"
+				RelativePath="..\src\include\grid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\grid.h"
+				RelativePath="..\src\frontend\plotting\grid.h"
 				>
 			</File>
 			<File
@@ -1220,11 +1216,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\parser\inp.h"
+				RelativePath="..\src\frontend\inp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\frontend\inp.h"
+				RelativePath="..\src\spicelib\parser\inp.h"
 				>
 			</File>
 			<File
@@ -4515,10 +4511,6 @@
 				RelativePath="..\src\frontend\commands.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\compatmode.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parser\complete.c"
 				>
@@ -5015,10 +5007,6 @@
 				RelativePath="..\src\frontend\plotting\grid.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\misc\hash.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\hcomp.c"
 				>
@@ -5895,10 +5883,6 @@
 				RelativePath="..\src\frontend\measure.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\misc\mempool.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\spicelib\devices\mes\mes.c"
 				>