diff --git a/src/plugins/fd/bpipe-fd.c b/src/plugins/fd/bpipe-fd.c
index 590f1002076..bd2d690340c 100644
--- a/src/plugins/fd/bpipe-fd.c
+++ b/src/plugins/fd/bpipe-fd.c
@@ -27,13 +27,6 @@
 #include "fd_plugins.h"
 #include "fd_common.h"
 
-#undef malloc
-#undef free
-#undef strdup
-
-#define fi __FILE__
-#define li __LINE__
-
 static const int dbglvl = 150;
 
 #define PLUGIN_LICENSE      "Bareos AGPLv3"
@@ -243,7 +236,7 @@ static bRC handlePluginEvent(bpContext *ctx, bEvent *event, void *value)
       char *p;
 
       Dmsg(ctx, dbglvl, "bpipe-fd: pluginEvent cmd=%s\n", (char *)value);
-      p_ctx->cmd = strdup((char *)value);
+      p_ctx->cmd = bstrdup((char *)value);
       p = strchr(p_ctx->cmd, ':');
       if (!p) {
          Jmsg(ctx, M_FATAL, "Plugin terminator not found: %s\n", (char *)value);
diff --git a/src/plugins/fd/test-deltaseq-fd.c b/src/plugins/fd/test-deltaseq-fd.c
index 32c813ba908..f44ec52d61e 100644
--- a/src/plugins/fd/test-deltaseq-fd.c
+++ b/src/plugins/fd/test-deltaseq-fd.c
@@ -27,10 +27,6 @@
 #include "fd_plugins.h"
 #include "fd_common.h"
 
-#undef malloc
-#undef free
-#undef strdup
-
 static const int dbglvl = 0;
 
 #define PLUGIN_LICENSE      "Bareos AGPLv3"
diff --git a/src/plugins/fd/test-plugin-fd.c b/src/plugins/fd/test-plugin-fd.c
index 058c889e435..8db71b5e256 100644
--- a/src/plugins/fd/test-plugin-fd.c
+++ b/src/plugins/fd/test-plugin-fd.c
@@ -30,13 +30,6 @@
 #include "lib/ini.h"
 #include <wchar.h>
 
-#undef malloc
-#undef free
-#undef strdup
-
-#define fi __FILE__
-#define li __LINE__
-
 static const int dbglvl = 000;
 
 #define PLUGIN_LICENSE      "Bareos AGPLv3"
@@ -301,7 +294,7 @@ static bRC handlePluginEvent(bpContext *ctx, bEvent *event, void *value)
       char *p;
 
       Dmsg(ctx, dbglvl, "test-plugin-fd: pluginEvent cmd=%s\n", (char *)value);
-      p_ctx->cmd = strdup((char *)value);
+      p_ctx->cmd = bstrdup((char *)value);
       p = strchr(p_ctx->cmd, ':');
       if (!p) {
          Jmsg(ctx, M_FATAL, "Plugin terminator not found: %s\n", (char *)value);