diff --git a/ChangeLog b/ChangeLog
index 8c4a7b8a9..4e7afe78e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-01-11 Dietmar Warning
+ * src/spicelib/devices/hisim/hsm1eval1xx.c: using ngspice.h as a central place
+
 2009-01-10 Holger Vogt
  * windisp.c: improve plot window handling, still not yet perfect
 
diff --git a/src/spicelib/devices/hisim/hsm1eval102.c b/src/spicelib/devices/hisim/hsm1eval102.c
index d4128c802..6cf200580 100644
--- a/src/spicelib/devices/hisim/hsm1eval102.c
+++ b/src/spicelib/devices/hisim/hsm1eval102.c
@@ -63,17 +63,8 @@
 /*---------------------------------------------------*
 * Header files.
 *-----------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <float.h>
-#include "config.h"
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-#ifdef _MSC_VER
-#define finite _finite
-#endif
+#include "ngspice.h"
+
 /*-----------------------------------*
 * HiSIM macros and structures.
 * - All inputs and outputs are defined here.
diff --git a/src/spicelib/devices/hisim/hsm1eval112.c b/src/spicelib/devices/hisim/hsm1eval112.c
index 8d3c88e65..14ac7923f 100644
--- a/src/spicelib/devices/hisim/hsm1eval112.c
+++ b/src/spicelib/devices/hisim/hsm1eval112.c
@@ -63,17 +63,7 @@
 /*---------------------------------------------------*
 * Header files.
 *-----------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <float.h>
-#include "config.h"
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-#ifdef _MSC_VER
-#define finite _finite
-#endif
+#include "ngspice.h"
 
 /*-----------------------------------*
 * HiSIM macros and structures.
diff --git a/src/spicelib/devices/hisim/hsm1eval120.c b/src/spicelib/devices/hisim/hsm1eval120.c
index f3c39a0c5..1f6743c94 100644
--- a/src/spicelib/devices/hisim/hsm1eval120.c
+++ b/src/spicelib/devices/hisim/hsm1eval120.c
@@ -63,17 +63,7 @@
 /*---------------------------------------------------*
 * Header files.
 *-----------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <float.h>
-#include "config.h"
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-#ifdef _MSC_VER
-#define finite _finite
-#endif
+#include "ngspice.h"
 
 /*-----------------------------------*
 * HiSIM macros and structures.