diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index fc87cd91f65..e5fe02efe7f 100644
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -21,9 +21,6 @@
 
 #include "includes.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 /****************************************************************************
  Support for server level security.
 ****************************************************************************/
diff --git a/source/auth/gensec/gensec_gssapi.c b/source/auth/gensec/gensec_gssapi.c
index b6fda0402f8..183e3f201b1 100644
--- a/source/auth/gensec/gensec_gssapi.c
+++ b/source/auth/gensec/gensec_gssapi.c
@@ -29,9 +29,6 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 struct gensec_gssapi_state {
 	gss_ctx_id_t gssapi_context;
 	struct gss_channel_bindings_struct *input_chan_bindings;
diff --git a/source/auth/gensec/spnego.c b/source/auth/gensec/spnego.c
index 28d76ff5b50..2d1d779e434 100644
--- a/source/auth/gensec/spnego.c
+++ b/source/auth/gensec/spnego.c
@@ -25,9 +25,6 @@
 #include "includes.h"
 #include "auth/auth.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 enum spnego_state_position {
 	SPNEGO_SERVER_START,
 	SPNEGO_CLIENT_START,
diff --git a/source/auth/gensec/spnego_parse.c b/source/auth/gensec/spnego_parse.c
index e48c32f0dab..59b09b1969c 100644
--- a/source/auth/gensec/spnego_parse.c
+++ b/source/auth/gensec/spnego_parse.c
@@ -25,9 +25,6 @@
 #include "auth/auth.h"
 #include "asn_1.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 static BOOL read_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit *token)
 {
 	ZERO_STRUCTP(token);
diff --git a/source/auth/ntlm_check.c b/source/auth/ntlm_check.c
index fb7dd3384d0..fa9677e75e0 100644
--- a/source/auth/ntlm_check.c
+++ b/source/auth/ntlm_check.c
@@ -24,9 +24,6 @@
 #include "lib/crypto/crypto.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 /****************************************************************************
  Core of smb password checking routine.
 ****************************************************************************/
diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 8612aa9ac0b..cb614b49afe 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -29,9 +29,6 @@
 
 #include "includes.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 #ifdef WITH_PAM
 
 /*******************************************************************
diff --git a/source/auth/pass_check.c b/source/auth/pass_check.c
index 132d2194903..6bcb52d5b68 100644
--- a/source/auth/pass_check.c
+++ b/source/auth/pass_check.c
@@ -25,9 +25,6 @@
 #include "system/passwd.h"
 #include "system/iconv.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
 /* these are kept here to keep the string_combinations function simple */
 static fstring this_user;
 #if !defined(WITH_PAM) 
diff --git a/source/lib/gencache.c b/source/lib/gencache.c
index 2db66b7564e..de8c47ada59 100644
--- a/source/lib/gencache.c
+++ b/source/lib/gencache.c
@@ -27,9 +27,6 @@
 #include "system/filesys.h"
 #include "db_wrap.h"
 
-#undef  DBGC_CLASS
-#define DBGC_CLASS DBGC_TDB
-
 #define TIMEOUT_LEN 12
 #define CACHE_DATA_FMT	"%12u/%s"
 
diff --git a/source/lib/registry/common/reg_interface.c b/source/lib/registry/common/reg_interface.c
index 76de2f041f3..2abe90f2d10 100644
--- a/source/lib/registry/common/reg_interface.c
+++ b/source/lib/registry/common/reg_interface.c
@@ -22,9 +22,6 @@
 #include "dlinklist.h"
 #include "registry.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_REGISTRY
-
 /* List of available backends */
 static struct reg_init_function_entry *backends = NULL;
 
diff --git a/source/lib/registry/common/reg_util.c b/source/lib/registry/common/reg_util.c
index e12cff186a2..2d933f2e6bc 100644
--- a/source/lib/registry/common/reg_util.c
+++ b/source/lib/registry/common/reg_util.c
@@ -21,9 +21,6 @@
 #include "includes.h"
 #include "registry.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_REGISTRY
-
 static const struct {
 	uint32_t id;
 	const char *name;
diff --git a/source/lib/registry/reg_samba.c b/source/lib/registry/reg_samba.c
index 3c9ae3f4153..6341a1c4eec 100644
--- a/source/lib/registry/reg_samba.c
+++ b/source/lib/registry/reg_samba.c
@@ -20,9 +20,6 @@
 #include "includes.h"
 #include "registry.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_REGISTRY
-
 static WERROR reg_samba_get_predef (struct registry_context *ctx, uint32_t hkey, struct registry_key **k)
 {
 	WERROR error;
diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index 44f9fe93116..356847c6eeb 100644
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -29,9 +29,6 @@
 #include "pstring.h"
 #include "db_wrap.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_PASSDB
-
 static struct tdb_wrap *tdb;
 
 /**
diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index 61d6ff3b85c..35520756e71 100644
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -30,9 +30,6 @@
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_WINBIND
-
 #define SQUID_BUFFER_SIZE 2010
 
 enum stdio_helper_mode {