diff --git a/modules/src/idf/idf_pkg.body b/modules/src/idf/idf_pkg.body
index 3fd6757a6..ba5e4da83 100644
--- a/modules/src/idf/idf_pkg.body
+++ b/modules/src/idf/idf_pkg.body
@@ -72,7 +72,7 @@ new_idf(tg, size, cpy)
 	return pidf++;
 }
 
-#ifdef	DEBUG
+#ifdef	IDF_DEBUG
 hash_stat()
 {
 	register int i;
@@ -84,13 +84,13 @@ hash_stat()
 
 		while (notch)	{
 			cnt++;
-			notch = notch->next;
+			notch = notch->id_next;
 		}
 		print("%d %d\n", i, cnt);
 	}
 	print("End hash table tally\n");
 }
-#endif	DEBUG
+#endif	IDF_DEBUG
 
 struct idf *
 str2idf(tg, cpy)
@@ -135,12 +135,12 @@ str2idf(tg, cpy)
 
 		if (cmp == 0) return notch;
 		if (cmp < 0) break;
-		hook = &notch->next;
+		hook = &notch->id_next;
 	}
 	/* a new struct idf must be inserted at the hook */
 	if (cpy < 0) return 0;
 	notch = new_idf(tg, size, cpy);
-	notch->next = *hook;
+	notch->id_next = *hook;
 	*hook = notch;		/* hooked in */
 	return notch;
 }
diff --git a/modules/src/idf/idf_pkg.spec b/modules/src/idf/idf_pkg.spec
index 95e661150..193006626 100644
--- a/modules/src/idf/idf_pkg.spec
+++ b/modules/src/idf/idf_pkg.spec
@@ -14,7 +14,7 @@
 #endif
 
 struct idf	{
-	struct idf *next;	/* links idf-structures together */
+	struct idf *id_next;	/* links idf-structures together */
 	char *id_text;		/* string representing the name */
 #ifdef IDF_TYPE
 	IDF_TYPE IDF_NAME;	/* user defined type and selector */