diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c
index 7f311d017..05acf3350 100644
--- a/src/std/link/lnkCalc.c
+++ b/src/std/link/lnkCalc.c
@@ -38,17 +38,7 @@
 
 typedef long (*FASTCONVERT)();
 
-/* Change 'undef' to 'define' to turn on debug statements: */
-#undef DEBUG_LINK
-
-#ifdef DEBUG_LINK
-    int lnkCalcDebug = 10;
-#   define IFDEBUG(n) \
-        if (lnkCalcDebug >= n) /* block or statement */
-#else
-#   define IFDEBUG(n) \
-        if(0) /* Compiler will elide the block or statement */
-#endif
+#define IFDEBUG(n) if(clink->jlink.debug)
 
 typedef struct calc_link {
     jlink jlink;        /* embedded object */
@@ -348,6 +338,8 @@ static void lnkCalc_end_child(jlink *parent, jlink *child)
 
 static struct lset* lnkCalc_get_lset(const jlink *pjlink)
 {
+    calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
+
     IFDEBUG(10)
         printf("lnkCalc_get_lset(calc@%p)\n", pjlink);
 
@@ -480,6 +472,9 @@ static int lnkCalc_isConn(const struct link *plink)
 
 static int lnkCalc_getDBFtype(const struct link *plink)
 {
+    calc_link *clink = CONTAINER(plink->value.json.jlink,
+        struct calc_link, jlink);
+
     IFDEBUG(10) {
         calc_link *clink = CONTAINER(plink->value.json.jlink,
             struct calc_link, jlink);
@@ -492,6 +487,9 @@ static int lnkCalc_getDBFtype(const struct link *plink)
 
 static long lnkCalc_getElements(const struct link *plink, long *nelements)
 {
+    calc_link *clink = CONTAINER(plink->value.json.jlink,
+        struct calc_link, jlink);
+
     IFDEBUG(10) {
         calc_link *clink = CONTAINER(plink->value.json.jlink,
             struct calc_link, jlink);
diff --git a/src/std/link/lnkConst.c b/src/std/link/lnkConst.c
index 5fcf84bc4..a647e6a60 100644
--- a/src/std/link/lnkConst.c
+++ b/src/std/link/lnkConst.c
@@ -22,17 +22,7 @@
 #include "epicsExport.h"
 
 
-/* Change 'undef' to 'define' to turn on debug statements: */
-#undef DEBUG_LINK
-
-#ifdef DEBUG_LINK
-    int lnkConstDebug = 10;
-#   define IFDEBUG(n) \
-        if (lnkConstDebug >= n) /* block or statement */
-#else
-#   define IFDEBUG(n) \
-        if(0) /* Compiler will elide the block or statement */
-#endif
+#define IFDEBUG(n) if(clink->jlink.debug)
 
 typedef long (*FASTCONVERT)();
 
@@ -148,7 +138,9 @@ static jlif_result lnkConst_integer(jlink *pjlink, long num)
     return jlif_continue;
 }
 
-static jlif_result lnkConst_boolean(jlink *pjlink, int val) {
+static jlif_result lnkConst_boolean(jlink *pjlink, int val)
+{
+    const_link *clink = CONTAINER(pjlink, const_link, jlink);
     IFDEBUG(10)
         printf("lnkConst_boolean(const@%p, %d)\n", pjlink, val);
 
@@ -278,6 +270,8 @@ static jlif_result lnkConst_start_array(jlink *pjlink)
 
 static jlif_result lnkConst_end_array(jlink *pjlink)
 {
+    const_link *clink = CONTAINER(pjlink, const_link, jlink);
+
     IFDEBUG(10)
         printf("lnkConst_end_array(const@%p)\n", pjlink);
 
@@ -286,6 +280,8 @@ static jlif_result lnkConst_end_array(jlink *pjlink)
 
 static struct lset* lnkConst_get_lset(const jlink *pjlink)
 {
+    const_link *clink = CONTAINER(pjlink, const_link, jlink);
+
     IFDEBUG(10)
         printf("lnkConst_get_lset(const@%p)\n", pjlink);
 
@@ -538,6 +534,8 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
 
 static long lnkConst_getNelements(const struct link *plink, long *nelements)
 {
+    const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
+
     IFDEBUG(10)
         printf("lnkConst_getNelements(const@%p, (%ld))\n",
             plink->value.json.jlink, *nelements);
@@ -549,6 +547,8 @@ static long lnkConst_getNelements(const struct link *plink, long *nelements)
 static long lnkConst_getValue(struct link *plink, short dbrType, void *pbuffer,
         long *pnRequest)
 {
+    const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
+
     IFDEBUG(10)
         printf("lnkConst_getValue(const@%p, %d, %p, ... (%ld))\n",
             plink->value.json.jlink, dbrType, pbuffer, *pnRequest);