Index: generic/nsfDebug.c
===================================================================
diff -u -N -r0de05aaed50fced1cd80a9408560a38fb2454bcf -rb6f285f739dbbb1c0808759854e0dcfb020bbc2e
--- generic/nsfDebug.c	(.../nsfDebug.c)	(revision 0de05aaed50fced1cd80a9408560a38fb2454bcf)
+++ generic/nsfDebug.c	(.../nsfDebug.c)	(revision b6f285f739dbbb1c0808759854e0dcfb020bbc2e)
@@ -243,10 +243,8 @@
  *----------------------------------------------------------------------
  */
 
-void  NsfMemCountAlloc(char *id, void *p) nonnull(1);
-
 void
-NsfMemCountAlloc(char *id, void *p) {
+NsfMemCountAlloc(const char *id, const void *p) {
   int new, *tableInitialized;
   NsfMemCounter *entry;
   Tcl_HashTable *tablePtr = NsfMemCountGetTable(&tableInitialized);
@@ -294,10 +292,8 @@
  *----------------------------------------------------------------------
  */
 
-void NsfMemCountFree(const char *id, void *p) nonnull(1);
-
 void
-NsfMemCountFree(const char *id, void *p) {
+NsfMemCountFree(const char *id, const void *p) {
   NsfMemCounter *entry;
   int *tableInitialized;
   Tcl_HashTable *tablePtr = NsfMemCountGetTable(&tableInitialized);
Index: generic/nsfInt.h
===================================================================
diff -u -N -rd96dedf3da9a133c17c602f665ecff9dbb377ced -rb6f285f739dbbb1c0808759854e0dcfb020bbc2e
--- generic/nsfInt.h	(.../nsfInt.h)	(revision d96dedf3da9a133c17c602f665ecff9dbb377ced)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision b6f285f739dbbb1c0808759854e0dcfb020bbc2e)
@@ -223,7 +223,7 @@
 #  define MEM_COUNT_RELEASE()
 #endif
 
-# define STRING_NEW(target, p, l)  {char *tempValue = ckalloc((unsigned)(l)+1u); strncpy((tempValue), (p), (l)+1u); *((tempValue)+(l)) = '\0'; target = tempValue; MEM_COUNT_ALLOC(#target, (target))}
+# define STRING_NEW(target, p, l)  {char *tempValue = ckalloc((unsigned)(l)+1u); strncpy((tempValue), (p), (l)+1u); *((tempValue)+(l)) = '\0'; target = tempValue; MEM_COUNT_ALLOC(#target, (target));}
 # define STRING_FREE(key, p)  MEM_COUNT_FREE((key), (p)); ckfree((char*)(p))
 
 #define DSTRING_INIT(dsPtr) Tcl_DStringInit(dsPtr); MEM_COUNT_ALLOC("DString",(dsPtr))
@@ -1132,8 +1132,8 @@
  * MEM Counting
  */
 #ifdef NSF_MEM_COUNT
-void NsfMemCountAlloc(const char *id, void *);
-void NsfMemCountFree(const char *id, void *);
+void NsfMemCountAlloc(const char *id, const void *p) nonnull(1);
+void NsfMemCountFree(const char *id, const void *p) nonnull(1);
 void NsfMemCountInit(void);
 void NsfMemCountRelease(void);
 #endif /* NSF_MEM_COUNT */