Revert Jelmer's CFLAGS commit e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c

This commit broke the build, because not all files (libreplace, popt)
were updated.

Andrew Bartlett

18 files changed, 50 insertions, 83 deletions

diff --git a/source/auth/config.mk b/source/auth/config.mk
index b825c520ed8..f13c2e57589 100644
--- a/source/auth/config.mk
+++ b/source/auth/config.mk
@@ -27,7 +27,6 @@ PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
 PRIVATE_DEPENDENCIES = LDAP_ENCODE
 
 auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o)
-$(auth_sam_OBJ_FILES): CFLAGS+=$(LDB_CFLAGS)
 
 $(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES:.o=.c)))
 
diff --git a/source/auth/credentials/config.mk b/source/auth/credentials/config.mk
index 03195d77c4e..2eeeec20ecf 100644
--- a/source/auth/credentials/config.mk
+++ b/source/auth/credentials/config.mk
@@ -6,8 +6,8 @@ PUBLIC_DEPENDENCIES = \
 PRIVATE_DEPENDENCIES = \
 		SECRETS
 
+
 CREDENTIALS_OBJ_FILES = $(addprefix $(authsrcdir)/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
-$(CREDENTIALS_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS)
 
 $(eval $(call proto_header_template,$(authsrcdir)/credentials/credentials_proto.h,$(CREDENTIALS_OBJ_FILES:.o=.c)))
 
diff --git a/source/auth/gensec/config.mk b/source/auth/gensec/config.mk
index b563481e4a9..f08ff2638a5 100644
--- a/source/auth/gensec/config.mk
+++ b/source/auth/gensec/config.mk
@@ -26,7 +26,6 @@ PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth_session auth_sam
 ################################################
 
 gensec_krb5_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_krb5.o)
-$(gensec_krb5_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS)
 
 ################################################
 # Start MODULE gensec_gssapi
@@ -38,7 +37,6 @@ PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS
 ################################################
 
 gensec_gssapi_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_gssapi.o)
-$(gensec_gssapi_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS)
 
 ################################################
 # Start MODULE cyrus_sasl
diff --git a/source/auth/kerberos/config.mk b/source/auth/kerberos/config.mk
index 6f06b6298c4..951e247258d 100644
--- a/source/auth/kerberos/config.mk
+++ b/source/auth/kerberos/config.mk
@@ -14,7 +14,5 @@ KERBEROS_OBJ_FILES = $(addprefix $(authsrcdir)/kerberos/, \
 	gssapi_parse.o \
 	krb5_init_context.o)
 
-$(KERBEROS_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/hx509
-
 $(eval $(call proto_header_template,$(authsrcdir)/kerberos/proto.h,$(KERBEROS_OBJ_FILES:.o=.c)))
 
diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 8b9a297d476..d932f09a694 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -34,6 +34,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 # Start Subsystem $1
 @<:@SUBSYSTEM::$1@:>@
 PRIVATE_DEPENDENCIES = $3
+CFLAGS = \$($1_CFLAGS)
 ENABLE = YES
 # End Subsystem $1
 ###################################
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 0923770729a..8c7d75221c7 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -32,6 +32,8 @@ my $section_types = {
 
 		"ENABLE"		=> "bool",
 
+		"CFLAGS"		=> "list",
+		"LDFLAGS"		=> "list",
 		"STANDARD_VISIBILITY"	=> "string",
 		"INIT_FUNCTION_SENTINEL" => "string"
 		},
@@ -47,6 +49,8 @@ my $section_types = {
 		"ENABLE"		=> "bool",
 
 		"OUTPUT_TYPE"		=> "list",
+
+		"CFLAGS"		=> "list"
 		},
 	"BINARY" => {
 
diff --git a/source/dsdb/config.mk b/source/dsdb/config.mk
index d6e007ac580..7b700fda22f 100644
--- a/source/dsdb/config.mk
+++ b/source/dsdb/config.mk
@@ -16,7 +16,6 @@ SAMDB_OBJ_FILES = $(addprefix $(dsdbsrcdir)/, \
 		samdb/samdb_privilege.o \
 		samdb/cracknames.o \
 		repl/replicated_objects.o)
-$(SAMDB_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS)
 
 $(eval $(call proto_header_template,$(dsdbsrcdir)/samdb/samdb_proto.h,$(SAMDB_OBJ_FILES:.o=.c)))
 # PUBLIC_HEADERS += dsdb/samdb/samdb.h
@@ -30,8 +29,6 @@ SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \
 		util.o)
 $(eval $(call proto_header_template,$(dsdbsrcdir)/common/proto.h,$(SAMDB_COMMON_OBJ_FILES:.o=.c)))
 
-$(SAMDB_COMMON_OBJ_FILES): CFLAGS+=$(LDB_CFLAGS)
-
 [SUBSYSTEM::SAMDB_SCHEMA]
 PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
 
diff --git a/source/dsdb/samdb/ldb_modules/config.mk b/source/dsdb/samdb/ldb_modules/config.mk
index facf7be7226..388b67c6d1d 100644
--- a/source/dsdb/samdb/ldb_modules/config.mk
+++ b/source/dsdb/samdb/ldb_modules/config.mk
@@ -155,7 +155,6 @@ PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE \
 ################################################
 
 ldb_password_hash_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/password_hash.o
-$(ldb_password_hash_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS)
 
 ################################################
 # Start MODULE ldb_local_password
@@ -242,49 +241,49 @@ INIT_FUNCTION = LDB_MODULE(update_kt)
 ################################################
 
 ldb_update_keytab_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/update_keytab.o 
-$(ldb_update_keytab_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS)
 
 ################################################
 # Start MODULE ldb_objectclass
 [MODULE::ldb_objectclass]
 INIT_FUNCTION = LDB_MODULE(objectclass)
 OUTPUT_TYPE = SHARED_LIBRARY
+CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY NDR_SECURITY SAMDB
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_objectclass
 ################################################
 
 ldb_objectclass_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/objectclass.o
-$(ldb_objectclass_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_subtree_rename
 [MODULE::ldb_subtree_rename]
 INIT_FUNCTION = LDB_MODULE(subtree_rename)
+CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_subtree_rename
 ################################################
 
 ldb_subtree_rename_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_rename.o
-$(ldb_subtree_rename_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_subtree_rename
 [MODULE::ldb_subtree_delete]
 INIT_FUNCTION = LDB_MODULE(subtree_delete)
+CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_subtree_rename
 ################################################
 
 ldb_subtree_delete_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_delete.o
-$(ldb_subtree_delete_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_linked_attributes
 [MODULE::ldb_linked_attributes]
 INIT_FUNCTION = LDB_MODULE(linked_attributes)
+CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 SUBSYSTEM = LIBLDB
@@ -292,24 +291,24 @@ SUBSYSTEM = LIBLDB
 ################################################
 
 ldb_linked_attributes_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/linked_attributes.o
-$(ldb_linked_attributes_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_ranged_results
 [MODULE::ldb_ranged_results]
 INIT_FUNCTION = LDB_MODULE(ranged_results)
+CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_ranged_results
 ################################################
 
 ldb_ranged_results_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/ranged_results.o
-$(ldb_ranged_results_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_anr
 [MODULE::ldb_anr]
 INIT_FUNCTION = LDB_MODULE(anr)
+CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
@@ -317,12 +316,12 @@ SUBSYSTEM = LIBLDB
 ################################################
 
 ldb_anr_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/anr.o
-$(ldb_anr_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_normalise
 [MODULE::ldb_normalise]
 INIT_FUNCTION = LDB_MODULE(normalise)
+CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
@@ -330,12 +329,12 @@ SUBSYSTEM = LIBLDB
 ################################################
 
 ldb_normalise_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/normalise.o
-$(ldb_normalise_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
 ################################################
 # Start MODULE ldb_instancetype
 [MODULE::ldb_instancetype]
 INIT_FUNCTION = LDB_MODULE(instancetype)
+CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
@@ -343,5 +342,4 @@ SUBSYSTEM = LIBLDB
 ################################################
 
 ldb_instancetype_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/instancetype.o
-$(ldb_instancetype_OBJ_FILES): CFLAGS+=-Ilib/ldb/include
 
diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl
index a044fd1d494..61217817607 100755
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/heimdal_build/asn1_deps.pl
@@ -86,6 +86,7 @@ unshift @deps, "HEIMDAL_HEIM_ASN1" unless grep /HEIMDAL_HEIM_ASN1/, @deps;
 my $depstr = join(' ', @deps);
 
 print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'."\n";
+print "CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n";
 print "PUBLIC_DEPENDENCIES = $depstr\n\n";
 
 print "HEIMDAL_".uc($prefix)."_OBJ_FILES = ";
@@ -95,8 +96,6 @@ foreach $o_file (@o_files) {
 
 print "\n\n";
 
-print "\$(HEIMDAL_".uc($prefix)."_OBJ_FILES): CFLAGS+=-I\$(heimdalbuildsrcdir) -I\$(heimdalsrcdir)/lib/roken -I$dirname -I\$(heimdalsrcdir)/lib/asn1\n\n";
-
 print "clean:: \n";
 print "\t\@echo \"Deleting ASN1 output files generated from $file\"\n";
 print "\t\@rm -f $header\n";
diff --git a/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index 281bdfaecd7..17fc8c93ecc 100644
--- a/source/heimdal_build/config.mk
+++ b/source/heimdal_build/config.mk
@@ -3,6 +3,7 @@ heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build
 #######################
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1
 PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO
 # End SUBSYSTEM HEIMDAL_KDC
@@ -24,26 +25,24 @@ HEIMDAL_KDC_OBJ_FILES = \
 	$(heimdalsrcdir)/kdc/windc.o \
 	$(heimdalsrcdir)/kdc/kx509.o
 
-$(HEIMDAL_KDC_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc -I$(heimdalsrcdir)/lib/roken $(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib/ntlm -I$(heimdalsrcdir)/lib/hdb -I$(heimdalsrcdir)/lib
-
 [SUBSYSTEM::HEIMDAL_NTLM]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/ntlm
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5
 
 HEIMDAL_NTLM_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/ntlm/ntlm.o
 
-$(HEIMDAL_NTLM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/ntlm -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib $(KRB5_CFLAGS)
-
 [SUBSYSTEM::HEIMDAL_HDB_KEYS]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \
 					   HEIMDAL_HDB_ASN1
 
 HEIMDAL_HDB_KEYS_OBJ_FILES = $(heimdalsrcdir)/lib/hdb/keys.o
-$(HEIMDAL_HDB_KEYS_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb -I$(heimdalsrcdir)/lib/asn1 $(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/roken
 
 #######################
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb
 PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1
 # End SUBSYSTEM HEIMDAL_HDB
 #######################
@@ -58,11 +57,10 @@ HEIMDAL_HDB_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/hdb/ndbm.o \
 	$(heimdalsrcdir)/lib/hdb/hdb_err.o
 
-$(HEIMDAL_HDB_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/asn1 $(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/roken
-
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego -I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech
 PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1
 PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5
 # End SUBSYSTEM HEIMDAL_GSSAPI
@@ -176,12 +174,11 @@ HEIMDAL_GSSAPI_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/prf.o
 
-$(HEIMDAL_GSSAPI_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego -I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/hx509 -I$(heimdalsrcdir)/lib
-
 
 #######################
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err 
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
 # End SUBSYSTEM HEIMDAL_KRB5
@@ -275,11 +272,10 @@ HEIMDAL_KRB5_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/krb5/k524_err.o \
 	$(heimdalsrcdir)/lib/krb5/krb_err.o
 
-$(HEIMDAL_KRB5_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/hx509 -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/wind
-
 #######################
 # Start SUBSYSTEM HEIMDAL_HEIM_ASN1
 [SUBSYSTEM::HEIMDAL_HEIM_ASN1]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
@@ -296,11 +292,10 @@ HEIMDAL_HEIM_ASN1_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/asn1/timegm.o \
 	$(heimdalsrcdir)/lib/asn1/asn1_err.o
 
-$(HEIMDAL_HEIM_ASN1_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err
-
 #######################
 # Start SUBSYSTEM HEIMDAL_HCRYPTO_IMATH
 [SUBSYSTEM::HEIMDAL_HCRYPTO_IMATH]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto/imath 
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN 
 # End SUBSYSTEM HEIMDAL_HCRYPTO_IMATH
 #######################
@@ -310,6 +305,7 @@ HEIMDAL_HCRYPTO_IMATH_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/hcrypto/imath/iprime.o
 
 [SUBSYSTEM::HEIMDAL_HCRYPTO]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto -I$(heimdalsrcdir)/lib
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1
 # End SUBSYSTEM HEIMDAL_HCRYPTO
 #######################
@@ -346,11 +342,10 @@ HEIMDAL_HCRYPTO_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/hcrypto/camellia.o \
 	$(heimdalsrcdir)/lib/hcrypto/camellia-ntt.o
 
-$(HEIMDAL_HCRYPTO_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/hcrypto/imath -I$(heimdalsrcdir)/lib/roken
-
 #######################
 # Start SUBSYSTEM HEIMDAL_HX509
 [SUBSYSTEM::HEIMDAL_HX509]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 
 PRIVATE_DEPENDENCIES = \
 	HEIMDAL_ROKEN HEIMDAL_COM_ERR \
 	HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO \
@@ -387,11 +382,10 @@ HEIMDAL_HX509_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/hx509/revoke.o \
 	$(heimdalsrcdir)/lib/hx509/hx509_err.o
 
-$(HEIMDAL_HX509_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/wind
-
 #######################
 # Start SUBSYSTEM HEIMDAL_WIND
 [SUBSYSTEM::HEIMDAL_WIND]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/wind 
 PRIVATE_DEPENDENCIES = \
 	HEIMDAL_ROKEN HEIMDAL_COM_ERR
 
@@ -413,8 +407,6 @@ HEIMDAL_WIND_OBJ_FILES = \
 # End SUBSYSTEM HEIMDAL_WIND
 #######################
 
-$(HEIMDAL_WIND_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/wind -I$(heimdalsrcdir)/lib/com_err
-
 [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
 
 HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.o
@@ -433,6 +425,7 @@ $(HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(he
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
+CFLAGS =  -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
 PUBLIC_DEPENDENCIES = \
 			HEIMDAL_ROKEN_GETPROGNAME \
 			HEIMDAL_ROKEN_CLOSEFROM \
@@ -472,22 +465,20 @@ HEIMDAL_ROKEN_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/roken/rtbl.o \
 	$(heimdalbuildsrcdir)/replace.o
 
-$(HEIMDAL_ROKEN_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
-
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err 
 PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
 HEIMDAL_GLUE_OBJ_FILES = $(heimdalbuildsrcdir)/glue.o
 
-$(HEIMDAL_GLUE_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err 
-
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
 # End SUBSYSTEM HEIMDAL_COM_ERR
 #######################
@@ -496,8 +487,6 @@ HEIMDAL_COM_ERR_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/com_err/com_err.o \
 	$(heimdalsrcdir)/lib/com_err/error.o
 
-$(HEIMDAL_COM_ERR_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken
-
 #######################
 # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
@@ -547,11 +536,11 @@ $(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/li
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
 # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 #######################
 
 HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/com_err/lex.ho 
-$(HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
 
 #######################
 # Start BINARY compile_et
@@ -609,13 +598,13 @@ clean::
 #######################
 # Start SUBSYSTEM HEIMDAL
 [SUBSYSTEM::HEIMDAL]
+CFLAGS = -I$(heimdalbuildsrcdir)
 PUBLIC_DEPENDENCIES = \
 		HEIMDAL_GSSAPI HEIMDAL_KRB5
 # End SUBSYSTEM HEIMDAL
 #######################
 
 HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o
-$(HEIMDAL_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir)
 
 #######################
 # Start BINARY compile_et
@@ -629,10 +618,7 @@ samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \
 	$(heimdalsrcdir)/lib/roken/setprogname.o \
 	$(heimdalsrcdir)/lib/roken/getarg.o 
 
-$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken $(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/ntlm
+$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
 
 dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \
 	$(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c
-
-KRB5_CFLAGS = -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/com_err -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 -I$(heimdalsrc)/lib
-GSSAPI_CFLAGS = -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi
diff --git a/source/kdc/config.mk b/source/kdc/config.mk
index a2c00950c81..b3b8b216f07 100644
--- a/source/kdc/config.mk
+++ b/source/kdc/config.mk
@@ -11,11 +11,11 @@ PRIVATE_DEPENDENCIES = \
 #######################
 
 KDC_OBJ_FILES = $(addprefix $(kdcsrcdir)/, kdc.o kpasswdd.o)
-$(KDC_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/wind -I$(heimdalsrcdir)/kdc -I$(heimdalsrcdir)/lib/ntlm -I$(heimdalsrcdir)/lib/hdb
 
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::HDB_LDB]
+CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
 PRIVATE_DEPENDENCIES = \
 		LIBLDB auth_sam auth_sam_reply HEIMDAL CREDENTIALS \
 		HEIMDAL_HDB_ASN1
@@ -23,5 +23,4 @@ PRIVATE_DEPENDENCIES = \
 #######################
 
 HDB_LDB_OBJ_FILES = $(addprefix $(kdcsrcdir)/, hdb-ldb.o pac-glue.o)
-$(HDB_LDB_OBJ_FILES): CFLAGS+=-I$(heimdalsrcdir)/kdc -I$(heimdalsrcdir)/lib/hdb -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/krb5 $(KRB5_CFLAGS) -I$(heimdalsrcdir)/lib -I$(heimdalsrcdir)/lib/roken
 $(eval $(call proto_header_template,$(kdcsrcdir)/pac_glue.h,$(HDB_LDB_OBJ_FILES:.o=.c)))
diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index d7e2d0f4477..cc8f1e36ab8 100644
--- a/source/lib/ldb/config.mk
+++ b/source/lib/ldb/config.mk
@@ -2,11 +2,11 @@
 # Start MODULE ldb_asq
 [MODULE::ldb_asq]
 PRIVATE_DEPENDENCIES = LIBTALLOC
+CFLAGS = -I$(ldbdir)/include
 INIT_FUNCTION = LDB_MODULE(asq)
 SUBSYSTEM = LIBLDB
 
 ldb_asq_OBJ_FILES = $(ldbdir)/modules/asq.o
-$(ldb_asq_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 # End MODULE ldb_asq
 ################################################
 
@@ -14,61 +14,61 @@ $(ldb_asq_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 # Start MODULE ldb_server_sort
 [MODULE::ldb_server_sort]
 PRIVATE_DEPENDENCIES = LIBTALLOC
+CFLAGS = -I$(ldbdir)/include
 INIT_FUNCTION = LDB_MODULE(server_sort)
 SUBSYSTEM = LIBLDB
 
 # End MODULE ldb_sort
 ################################################
 ldb_server_sort_OBJ_FILES = $(ldbdir)/modules/sort.o
-$(ldb_server_sort_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ################################################
 # Start MODULE ldb_paged_results
 [MODULE::ldb_paged_results]
 INIT_FUNCTION = LDB_MODULE(paged_results)
+CFLAGS = -I$(ldbdir)/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_paged_results
 ################################################
 
 ldb_paged_results_OBJ_FILES = $(ldbdir)/modules/paged_results.o
-$(ldb_paged_results_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ################################################
 # Start MODULE ldb_paged_results
 [MODULE::ldb_paged_searches]
 INIT_FUNCTION = LDB_MODULE(paged_searches)
+CFLAGS = -I$(ldbdir)/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
 # End MODULE ldb_paged_results
 ################################################
 
 ldb_paged_searches_OBJ_FILES = $(ldbdir)/modules/paged_searches.o
-$(ldb_paged_searches_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ################################################
 # Start MODULE ldb_operational
 [MODULE::ldb_operational]
 SUBSYSTEM = LIBLDB
+CFLAGS = -I$(ldbdir)/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = LDB_MODULE(operational)
 # End MODULE ldb_operational
 ################################################
 
 ldb_operational_OBJ_FILES = $(ldbdir)/modules/operational.o
-$(ldb_operational_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ################################################
 # Start MODULE ldb_rdn_name
 [MODULE::ldb_rdn_name]
 SUBSYSTEM = LIBLDB
+CFLAGS = -I$(ldbdir)/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = LDB_MODULE(rdn_name)
 # End MODULE ldb_rdn_name
 ################################################
 
 ldb_rdn_name_OBJ_FILES = $(ldbdir)/modules/rdn_name.o
-$(ldb_rdn_name_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ldb_map_OBJ_FILES = $(addprefix $(ldbdir)/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o)
 
@@ -78,40 +78,42 @@ $(ldb_map_OBJ_FILES): CFLAGS+=-I$(ldbdir)/ldb_map
 # Start MODULE ldb_skel
 [MODULE::ldb_skel]
 SUBSYSTEM = LIBLDB
+CFLAGS = -I$(ldbdir)/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = LDB_MODULE(skel)
 # End MODULE ldb_skel
 ################################################
 
 ldb_skel_OBJ_FILES = $(ldbdir)/modules/skel.o
-$(ldb_skel_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ################################################
 # Start MODULE ldb_sqlite3
 [MODULE::ldb_sqlite3]
 SUBSYSTEM = LIBLDB
+CFLAGS = -I$(ldbdir)/include
 PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC
 # End MODULE ldb_sqlite3
 ################################################
 
 ldb_sqlite3_OBJ_FILES = $(ldbdir)/ldb_sqlite3/ldb_sqlite3.o
-$(ldb_sqlite3_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 ################################################
 # Start MODULE ldb_tdb
 [MODULE::ldb_tdb]
 SUBSYSTEM = LIBLDB
+CFLAGS = -I$(ldbdir)/include -I$(ldbdir)/ldb_tdb
 PRIVATE_DEPENDENCIES = \
 		LIBTDB LIBTALLOC
 # End MODULE ldb_tdb
 ################################################
 
 ldb_tdb_OBJ_FILES = $(addprefix $(ldbdir)/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pack.o ldb_index.o ldb_cache.o ldb_tdb_wrap.o)
-$(ldb_tdb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include -I$(ldbdir)/ldb_tdb
+
 
 ################################################
 # Start SUBSYSTEM ldb
 [LIBRARY::LIBLDB]
+CFLAGS = -I$(ldbdir)/include
 INIT_FUNCTION_TYPE = extern const struct ldb_module_ops
 PUBLIC_DEPENDENCIES = \
 		LIBTALLOC
@@ -143,7 +145,6 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ldbtest_OBJ_FILES = $(ldbdir)/tools/ldbtest.o
-$(ldbtest_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 ################################################
 # Start BINARY oLschema2ldif
@@ -156,7 +157,6 @@ PRIVATE_DEPENDENCIES = \
 
 
 oLschema2ldif_OBJ_FILES = $(addprefix $(ldbdir)/tools/, convert.o oLschema2ldif.o)
-$(oLschema2ldif_OBJ_FILES): CFLAGS+=-I$(ldbdir) -I$(ldbdir)/include
 
 MANPAGES += $(ldbdir)/man/oLschema2ldif.1
 
@@ -170,11 +170,8 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ad2oLschema_OBJ_FILES = $(addprefix $(ldbdir)/tools/, convert.o ad2oLschema.o)
-$(ad2oLschema_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 MANPAGES += $(ldbdir)/man/ad2oLschema.1
 
 mkinclude tools/config.mk
 mkinclude ldb_ildap/config.mk
-
-LDB_CFLAGS = -I$(ldbdir)/include
diff --git a/source/lib/ldb/ldb_ildap/config.mk b/source/lib/ldb/ldb_ildap/config.mk
index ed38b8a2870..94e3380038e 100644
--- a/source/lib/ldb/ldb_ildap/config.mk
+++ b/source/lib/ldb/ldb_ildap/config.mk
@@ -2,6 +2,7 @@
 # Start MODULE ldb_ildap
 [MODULE::ldb_ildap]
 SUBSYSTEM = LIBLDB
+CFLAGS = -I$(ldbdir)/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS
 ALIASES = ldapi ldaps ldap
@@ -9,4 +10,4 @@ ALIASES = ldapi ldaps ldap
 ################################################
 
 ldb_ildap_OBJ_FILES = $(ldbdir)/ldb_ildap/ldb_ildap.o
-$(ldb_ildap_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
+
diff --git a/source/lib/ldb/tools/config.mk b/source/lib/ldb/tools/config.mk
index 5efbd20396c..051fd0c57b8 100644
--- a/source/lib/ldb/tools/config.mk
+++ b/source/lib/ldb/tools/config.mk
@@ -1,6 +1,7 @@
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
+CFLAGS = -I$(ldbdir) -I$(ldbdir)/include
 PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
 # End SUBSYSTEM LIBLDB_CMDLINE
@@ -8,8 +9,6 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
 
 LIBLDB_CMDLINE_OBJ_FILES = $(ldbdir)/tools/cmdline.o
 
-$(LIBLDB_CMDLINE_OBJ_FILES): CFLAGS+=-I$(ldbdir)  $(LDB_CFLAGS)
-
 ################################################
 # Start BINARY ldbadd
 [BINARY::ldbadd]
@@ -19,8 +18,8 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ldbadd
 ################################################
 
+
 ldbadd_OBJ_FILES = $(ldbdir)/tools/ldbadd.o
-$(ldbadd_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 MANPAGES += $(ldbdir)/man/ldbadd.1
 
@@ -34,7 +33,6 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ldbdel_OBJ_FILES = $(ldbdir)/tools/ldbdel.o
-$(ldbdel_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 MANPAGES += $(ldbdir)/man/ldbdel.1
 
@@ -48,7 +46,6 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ldbmodify_OBJ_FILES = $(ldbdir)/tools/ldbmodify.o
-$(ldbmodify_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 MANPAGES += $(ldbdir)/man/ldbmodify.1
 
 ################################################
@@ -61,7 +58,6 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ldbsearch_OBJ_FILES = $(ldbdir)/tools/ldbsearch.o
-$(ldbsearch_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 MANPAGES += $(ldbdir)/man/ldbsearch.1
 
@@ -75,7 +71,6 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ldbedit_OBJ_FILES = $(ldbdir)/tools/ldbedit.o
-$(ldbedit_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 MANPAGES += $(ldbdir)/man/ldbedit.1
 
@@ -89,7 +84,6 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 ldbrename_OBJ_FILES = $(ldbdir)/tools/ldbrename.o
-$(ldbrename_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS)
 
 MANPAGES += $(ldbdir)/man/ldbrename.1
 
diff --git a/source/lib/tdr/config.mk b/source/lib/tdr/config.mk
index a8562cc1cd4..07506ec6472 100644
--- a/source/lib/tdr/config.mk
+++ b/source/lib/tdr/config.mk
@@ -1,8 +1,8 @@
 [SUBSYSTEM::TDR]
+CFLAGS = -Ilib/tdr
 PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
 
 TDR_OBJ_FILES = $(libtdrsrcdir)/tdr.o
-$(TDR_OBJ_FILES): CFLAGS+=-I$(libtdrsrcdir)
 
 $(eval $(call proto_header_template,$(libtdrsrcdir)/tdr_proto.h,$(TDR_OBJ_FILES:.o=.c)))
 
diff --git a/source/libnet/config.mk b/source/libnet/config.mk
index b1259699f52..fac8af18b77 100644
--- a/source/libnet/config.mk
+++ b/source/libnet/config.mk
@@ -11,8 +11,6 @@ LIBSAMBA-NET_OBJ_FILES = $(addprefix $(libnetsrcdir)/, \
 
 $(eval $(call proto_header_template,$(libnetsrcdir)/libnet_proto.h,$(LIBSAMBA-NET_OBJ_FILES:.o=.c)))
 
-$(LIBSAMBA-NET_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS) $(GSSAPI_CFLAGS)
-
 [PYTHON::python_net]
 LIBRARY_REALNAME = samba/net.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET
diff --git a/source/scripting/python/config.mk b/source/scripting/python/config.mk
index af014a8c9e7..b494ee6e8d4 100644
--- a/source/scripting/python/config.mk
+++ b/source/scripting/python/config.mk
@@ -21,7 +21,7 @@ PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
-$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) $(LDB_CFLAGS)
+$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
diff --git a/source/torture/config.mk b/source/torture/config.mk
index b11448a218f..5a1746c2159 100644
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -145,8 +145,6 @@ PRIVATE_DEPENDENCIES = \
 
 TORTURE_AUTH_OBJ_FILES = $(addprefix $(torturesrcdir)/auth/, ntlmssp.o pac.o)
 
-$(TORTURE_AUTH_OBJ_FILES): CFLAGS+=$(KRB5_CFLAGS)
-
 $(eval $(call proto_header_template,$(torturesrcdir)/auth/proto.h,$(TORTURE_AUTH_OBJ_FILES:.o=.c)))
 
 mkinclude local/config.mk