diff --git a/include/freerdp/utils/debug.h b/include/freerdp/utils/debug.h
index 99bc8e796..3810cbab3 100644
--- a/include/freerdp/utils/debug.h
+++ b/include/freerdp/utils/debug.h
@@ -20,9 +20,7 @@
 #ifndef __UTILS_DEBUG_H
 #define __UTILS_DEBUG_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef WITH_DEBUG_ASSERT
 #include <assert.h>
diff --git a/include/freerdp/utils/svc_plugin.h b/include/freerdp/utils/svc_plugin.h
index 4081bf0d9..cccb82ba2 100644
--- a/include/freerdp/utils/svc_plugin.h
+++ b/include/freerdp/utils/svc_plugin.h
@@ -26,6 +26,7 @@
 #include <freerdp/svc.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/event.h>
+#include <freerdp/utils/debug.h>
 
 typedef struct rdp_svc_plugin_private rdpSvcPluginPrivate;
 typedef struct rdp_svc_plugin rdpSvcPlugin;
@@ -46,4 +47,10 @@ void svc_plugin_init(rdpSvcPlugin* plugin, CHANNEL_ENTRY_POINTS* pEntryPoints);
 int svc_plugin_send(rdpSvcPlugin* plugin, STREAM* data_out);
 int svc_plugin_send_event(rdpSvcPlugin* plugin, FRDP_EVENT* event);
 
+#ifdef WITH_DEBUG_SVC
+#define DEBUG_SVC(fmt, ...) DEBUG_CLASS(SVC, fmt, ## __VA_ARGS__)
+#else
+#define DEBUG_SVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
+#endif
+
 #endif /* __SVC_PLUGIN_UTILS_H */
diff --git a/libfreerdp-utils/svc_plugin.c b/libfreerdp-utils/svc_plugin.c
index 210b7f1b5..f03ef46ce 100644
--- a/libfreerdp-utils/svc_plugin.c
+++ b/libfreerdp-utils/svc_plugin.c
@@ -29,12 +29,6 @@
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
-#ifdef WITH_DEBUG_SVC
-#define DEBUG_SVC(fmt, ...) DEBUG_CLASS(SVC, fmt, ## __VA_ARGS__)
-#else
-#define DEBUG_SVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
-#endif
-
 /* The list of all plugin instances. */
 typedef struct rdp_svc_plugin_list rdpSvcPluginList;
 struct rdp_svc_plugin_list