13 files changed, 16 insertions, 22 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 369c5bb4e6..63aec09847 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = session.o
 PRIVATE_PROTO_HEADER = session_proto.h
 PUBLIC_DEPENDENCIES = CREDENTIALS
 
-PUBLIC_HEADERS += auth/session.h
+# PUBLIC_HEADERS += auth/session.h
 
 [SUBSYSTEM::auth_system_session]
 OBJ_FILES = system_session.o
@@ -92,7 +92,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM auth
 #######################
 
-PUBLIC_HEADERS += auth/auth.h
+# PUBLIC_HEADERS += auth/auth.h
 
 [PYTHON::swig_auth]
 PUBLIC_DEPENDENCIES = auth_system_session
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index ef8db50109..83f2f0db93 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -12,7 +12,7 @@ PUBLIC_DEPENDENCIES = \
 PRIVATE_DEPENDENCIES = \
 		SECRETS
 
-PUBLIC_HEADERS += $(addprefix auth/credentials/, credentials.h credentials_krb5.h)
+PUBLIC_HEADERS += auth/credentials/credentials.h
 
 [PYTHON::swig_credentials]
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index b60f039284..14864f7e4c 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -11,7 +11,7 @@ PUBLIC_DEPENDENCIES = \
 # End SUBSYSTEM gensec
 #################################
 
-PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
+PUBLIC_HEADERS += auth/gensec/gensec.h
 
 ################################################
 # Start MODULE gensec_krb5
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index fb8cd4f503..1a20add91c 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -17,7 +17,7 @@ OBJ_FILES = \
 		repl/replicated_objects.o
 
 
-PUBLIC_HEADERS += dsdb/samdb/samdb.h
+# PUBLIC_HEADERS += dsdb/samdb/samdb.h
 
 [SUBSYSTEM::SAMDB_COMMON]
 PRIVATE_PROTO_HEADER = common/proto.h
@@ -36,7 +36,7 @@ OBJ_FILES = \
 		schema/schema_constructed.o \
 
 
-PUBLIC_HEADERS += dsdb/schema/schema.h
+# PUBLIC_HEADERS += dsdb/schema/schema.h
 
 #######################
 # Start SUBSYSTEM DREPL_SRV
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index d059bdf49b..d6e90928b0 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -26,7 +26,7 @@ OBJ_FILES = gencache/gencache.o
 PRIVATE_DEPENDENCIES = TDB_WRAP
 
 
-PUBLIC_HEADERS += lib/gencache/gencache.h
+# PUBLIC_HEADERS += lib/gencache/gencache.h
 
 [SUBSYSTEM::LDB_WRAP]
 OBJ_FILES = ldb_wrap.o
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 225a23c634..8001699aee 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -36,7 +36,7 @@ PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
 # End SUBSYSTEM LIBEVENTS
 ##############################
 
-PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
+# PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
 
 [PYTHON::swig_events]
 SWIG_FILE = events.i
diff --git a/source4/lib/nss_wrapper/config.mk b/source4/lib/nss_wrapper/config.mk
index 81b0ef36fd..03c10acc7a 100644
--- a/source4/lib/nss_wrapper/config.mk
+++ b/source4/lib/nss_wrapper/config.mk
@@ -4,5 +4,3 @@
 OBJ_FILES = nss_wrapper.o
 # End SUBSYSTEM NSS_WRAPPER
 ##############################
-
-PUBLIC_HEADERS += lib/nss_wrapper/nss_wrapper.h
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index 2b9f30a7bb..902692d9be 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -5,5 +5,3 @@ OBJ_FILES = socket_wrapper.o
 PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################
-
-PUBLIC_HEADERS += lib/socket_wrapper/socket_wrapper.h
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index c69804fa13..76342dc8fa 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -11,8 +11,6 @@ CFLAGS = -Ilib/tdb/include
 # End SUBSYSTEM ldb
 ################################################
 
-PUBLIC_HEADERS += $(tdbdir)/include/tdb.h
-
 ################################################
 # Start BINARY tdbtool
 [BINARY::tdbtool]
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 483e835e00..0bf0692193 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -40,7 +40,7 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
 PRIVATE_PROTO_HEADER = asn1_proto.h
 OBJ_FILES = asn1.o
 
-PUBLIC_HEADERS += lib/util/asn1.h
+# PUBLIC_HEADERS += lib/util/asn1.h
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 0aa67f35db..b85fbe7066 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -73,7 +73,7 @@ OBJ_FILES = cldap/cldap.o
 PUBLIC_DEPENDENCIES = LIBCLI_LDAP
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB
 
-PUBLIC_HEADERS += libcli/cldap/cldap.h
+# PUBLIC_HEADERS += libcli/cldap/cldap.h
 
 [SUBSYSTEM::LIBCLI_WREPL]
 PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
@@ -118,7 +118,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
 	LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
 
 
-PUBLIC_HEADERS += libcli/libcli.h
+# PUBLIC_HEADERS += libcli/libcli.h
 
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index c35b7decc4..00af6b37f2 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -25,10 +25,10 @@ OBJ_FILES = \
 		prereq_domain.o
 PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD
 
-PUBLIC_HEADERS += $(addprefix libnet/, libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
-				 libnet_rpc.h libnet_share.h libnet_time.h \
-				 libnet_user.h libnet_site.h libnet_vampire.h \
-				 userinfo.h userman.h)
+#PUBLIC_HEADERS += $(addprefix libnet/, libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
+#				 libnet_rpc.h libnet_share.h libnet_time.h \
+#				 libnet_user.h libnet_site.h libnet_vampire.h \
+#				 userinfo.h userman.h)
 
 
 [PYTHON::swig_net]
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 0f8e88eaa6..2f57c787ef 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -87,7 +87,7 @@ OBJ_FILES = \
 		ntvfs_interface.o \
 		ntvfs_util.o
 
-PUBLIC_HEADERS += ntvfs/ntvfs.h
+# PUBLIC_HEADERS += ntvfs/ntvfs.h
 #
 # End SUBSYSTEM NTVFS
 ################################################