-#define xmalloc(s) xmalloc_debug (s, __FILE__, __LINE__)
-#define xmalloc0(s) xmalloc0_debug (s, __FILE__, __LINE__)
-#define xrealloc(p, s) xrealloc_debug (p, s, __FILE__, __LINE__)
-#define xstrdup(p) xstrdup_debug (p, __FILE__, __LINE__)
-#define xfree(p) xfree_debug (p, __FILE__, __LINE__)
+#define xmalloc(s) debugging_malloc (s, __FILE__, __LINE__)
+#define xmalloc0(s) debugging_malloc0 (s, __FILE__, __LINE__)
+#define xrealloc(p, s) debugging_realloc (p, s, __FILE__, __LINE__)
+#define xstrdup(p) debugging_strdup (p, __FILE__, __LINE__)
+#define xfree(p) debugging_free (p, __FILE__, __LINE__)