diff --git a/src/include/ngspice/memory.h b/src/include/ngspice/memory.h
index c3030303c..f3d6635c0 100644
--- a/src/include/ngspice/memory.h
+++ b/src/include/ngspice/memory.h
@@ -38,13 +38,13 @@ extern void txfree(const void *ptr);
 
 #define RALLOC(ptr, type, number)                                       \
     do {                                                                \
-        if ((number) && (ptr = (type *)calloc((size_t)(number), sizeof(type))) == NULL) \
+        if ((number) && (ptr = (type *)tcalloc((size_t)(number), sizeof(type))) == NULL) \
             return E_NOMEM;                                             \
     } while(0)
 
 #define XALLOC(ptr, type, number)                                       \
     do {                                                                \
-        if ((number) && (ptr = (type *)calloc((size_t)(number), sizeof(type))) == NULL) { \
+        if ((number) && (ptr = (type *)tcalloc((size_t)(number), sizeof(type))) == NULL) { \
             SPfrontEnd->IFerrorf(E_PANIC, "Out of Memory");             \
             controlled_exit(1);                                         \
         }                                                               \
@@ -52,7 +52,7 @@ extern void txfree(const void *ptr);
 
 #define XCALLOC(ptr, type, number)                                      \
     do {                                                                \
-        if ((number) && (ptr = (type *)calloc((size_t)(number), sizeof(type))) == NULL) { \
+        if ((number) && (ptr = (type *)tcalloc((size_t)(number), sizeof(type))) == NULL) { \
             fprintf(stderr, "Out of Memory\n");                         \
             controlled_exit(1);                                         \
         }                                                               \
diff --git a/src/maths/sparse/spdefs.h b/src/maths/sparse/spdefs.h
index 9ff853183..b915dfa00 100644
--- a/src/maths/sparse/spdefs.h
+++ b/src/maths/sparse/spdefs.h
@@ -380,7 +380,7 @@ extern void * trealloc(const void *, size_t);
 /* A new calloc */
 #ifndef HAVE_LIBGC
 #define SP_CALLOC(ptr,type,number)                           \
-{ ptr = (type *) calloc((size_t)(number), sizeof(type));     \
+{ ptr = (type *) tcalloc((size_t)(number), sizeof(type));     \
 }
 #else /* HAVE_LIBCG */
 #define SP_CALLOC(ptr,type,number)                           \
diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c
index d859616b2..f35f3b28f 100644
--- a/src/spicelib/devices/cpl/cplsetup.c
+++ b/src/spicelib/devices/cpl/cplsetup.c
@@ -539,22 +539,22 @@ new_memory(int dim, int deg, int deg_o)
 
     for (i = 0; i < dim; i++)
         for (j = 0; j < dim; j++)
-            SiSv_1[i][j] = (double *) calloc((size_t) (deg_o+1), sizeof(double));
+            SiSv_1[i][j] = (double *) tcalloc((size_t) (deg_o+1), sizeof(double));
 
     for (i = 0; i < dim; i++)
         for (j = 0; j < dim; j++)
-            Sip[i][j] = (double *) calloc((size_t) (deg_o+1), sizeof(double));
+            Sip[i][j] = (double *) tcalloc((size_t) (deg_o+1), sizeof(double));
 
     for (i = 0; i < dim; i++)
         for (j = 0; j < dim; j++)
-            Si_1p[i][j] = (double *) calloc((size_t) (deg_o+1), sizeof(double));
+            Si_1p[i][j] = (double *) tcalloc((size_t) (deg_o+1), sizeof(double));
 
     for (i = 0; i < dim; i++)
         for (j = 0; j < dim; j++)
-            Sv_1p[i][j] = (double *) calloc((size_t) (deg_o+1), sizeof(double));
+            Sv_1p[i][j] = (double *) tcalloc((size_t) (deg_o+1), sizeof(double));
 
     for (i = 0; i < dim; i++)
-        W[i] = (double *) calloc(MAX_DEG, sizeof(double));
+        W[i] = (double *) tcalloc(MAX_DEG, sizeof(double));
 }
 
 /***
@@ -1355,7 +1355,7 @@ generate_out(int dim, int deg_o)
                     continue;
                 }
             }
-            p = SIV[i][j].Poly = (double *) calloc(7, sizeof(double));
+            p = SIV[i][j].Poly = (double *) tcalloc(7, sizeof(double));
             p[0] = c1;
             p[1] = c2;
             p[2] = c3;
@@ -1486,7 +1486,7 @@ matrix_p_mult(
         for (j = 0; j < dim; j++)
             for (k = 0; k < dim; k++) {
                 p = X[i][j].Poly[k] =
-                        (double *) calloc((size_t) (deg_o+1), sizeof(double));
+                        (double *) tcalloc((size_t) (deg_o+1), sizeof(double));
                 mult_p(A[i][k], T[k][j], p, deg, deg_o, deg_o);
                 t1 = X[i][j].C_0[k] = p[0];
                 if (t1 != 0.0) {
diff --git a/src/spicelib/devices/nbjt/nbjtset.c b/src/spicelib/devices/nbjt/nbjtset.c
index 2d723c087..41edc0724 100644
--- a/src/spicelib/devices/nbjt/nbjtset.c
+++ b/src/spicelib/devices/nbjt/nbjtset.c
@@ -17,7 +17,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "ngspice/meshext.h"
 
 #define TSCALLOC(var, size, type)\
-if (size && (var =(type *)calloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
+if (size && (var =(type *)tcalloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
    return(E_NOMEM);\
 }
 
diff --git a/src/spicelib/devices/nbjt2/nbt2set.c b/src/spicelib/devices/nbjt2/nbt2set.c
index c0b584da5..8b2adbe6a 100644
--- a/src/spicelib/devices/nbjt2/nbt2set.c
+++ b/src/spicelib/devices/nbjt2/nbt2set.c
@@ -18,7 +18,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "ngspice/suffix.h"
 
 #define TSCALLOC(var, size, type)\
-if (size && (var = (type *)calloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
+if (size && (var = (type *)tcalloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
    return(E_NOMEM);\
 }
 
diff --git a/src/spicelib/devices/numd/numdset.c b/src/spicelib/devices/numd/numdset.c
index 310db3045..48a1cdb06 100644
--- a/src/spicelib/devices/numd/numdset.c
+++ b/src/spicelib/devices/numd/numdset.c
@@ -17,7 +17,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "ngspice/meshext.h"
 
 #define TSCALLOC(var, size, type)\
-if (size && (var =(type *)calloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
+if (size && (var =(type *)tcalloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
    return(E_NOMEM);\
 }
 
diff --git a/src/spicelib/devices/numd2/nud2set.c b/src/spicelib/devices/numd2/nud2set.c
index 126696d41..c7a417503 100644
--- a/src/spicelib/devices/numd2/nud2set.c
+++ b/src/spicelib/devices/numd2/nud2set.c
@@ -18,7 +18,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "ngspice/suffix.h"
 
 #define TSCALLOC(var, size, type)\
-if (size && (var =(type *)calloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
+if (size && (var =(type *)tcalloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
    return(E_NOMEM);\
 }
 
diff --git a/src/spicelib/devices/numos/nummset.c b/src/spicelib/devices/numos/nummset.c
index c4c1d26c1..7b1d46c0b 100644
--- a/src/spicelib/devices/numos/nummset.c
+++ b/src/spicelib/devices/numos/nummset.c
@@ -18,7 +18,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "ngspice/suffix.h"
 
 #define TSCALLOC(var, size, type)\
-if (size && (var = (type *)calloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
+if (size && (var = (type *)tcalloc(1, (unsigned)(size)*sizeof(type))) == NULL) {\
    return(E_NOMEM);\
 }