diff --git a/src/spicelib/devices/hisimhv1/hsmhvld.c b/src/spicelib/devices/hisimhv1/hsmhvld.c
index ba9ec3b47..697a301c0 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvld.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvld.c
@@ -2244,7 +2244,7 @@ line755: /* standard entry if HSMHVevaluate is bypassed */
 
           /* store small signal parameters */
           if (ckt->CKTmode & MODEINITSMSIG) {
-            /* printf("HSMHV_load: (small signal) ByPass=%d\n",ByPass);
+            /* printf("HSMHV_load: (small signal) ByPass=%d\n",ByPass); */
 /*          printf("HSMHV_load: ydc_dP=%e %e %e %e %e %e %e %e\n",
                     ydc_dP[0],ydc_dP[1],ydc_dP[2],ydc_dP[3],ydc_dP[4],ydc_dP[5],ydc_dP[6],ydc_dP[7]);
             printf("HSMHV_load: ych_dP=%e %e %e %e %e %e %e %e\n",
diff --git a/src/spicelib/devices/hisimhv1/hsmhvnoi.c b/src/spicelib/devices/hisimhv1/hsmhvnoi.c
index ad362ba1f..535334205 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvnoi.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvnoi.c
@@ -34,9 +34,6 @@
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
-
 int HSMHVnoise (
      int mode, int operation,
      GENmodel *inModel,
@@ -81,10 +78,8 @@ int HSMHVnoise (
 	  case N_DENS:
 	    for ( i = 0; i < HSMHVNSRCS; i++ ) { 
 	      (void) sprintf(name, "onoise.%s%s", 
-			     (char *)here->HSMHVname, HSMHVnNames[i]);
-	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+			     here->HSMHVname, HSMHVnNames[i]);
+	      data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
 	      (*(SPfrontEnd->IFnewUid)) 
@@ -95,10 +90,8 @@ int HSMHVnoise (
 	  case INT_NOIZ:
 	    for ( i = 0; i < HSMHVNSRCS; i++ ) {
 	      (void) sprintf(name, "onoise_total.%s%s", 
-			     (char *)here->HSMHVname, HSMHVnNames[i]);
-	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+			     here->HSMHVname, HSMHVnNames[i]);
+	      data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
 	      (*(SPfrontEnd->IFnewUid)) 
@@ -106,10 +99,8 @@ int HSMHVnoise (
 		 (IFuid) NULL, name, UID_OTHER, NULL);
 	      
 	      (void) sprintf(name, "inoise_total.%s%s", 
-			     (char *)here->HSMHVname, HSMHVnNames[i]);
-	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+			     here->HSMHVname, HSMHVnNames[i]);
+	      data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
 	      (*(SPfrontEnd->IFnewUid))