--- a/components/krb5/Makefile	Wed Apr 27 14:28:37 2016 -0700
+++ b/components/krb5/Makefile	Wed Apr 27 16:11:34 2016 -0700
@@ -39,6 +39,9 @@
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
+
+LINT_FLAGS += -I$(PROTOUSRINCDIR) -I$(PROTOUSRINCDIR)/kerberosv5 -I$(COMPONENT_DIR)/Solaris
 
 # Depends on S12-only header file in ON.
 ifeq ($(BUILD_TYPE), evaluation)
@@ -112,12 +115,12 @@
 	$(CP) Solaris/kadm_host_srv_names.c $(SOURCE_DIR)/src/lib/kadm5/; \
 	$(CP) Solaris/kt_findrealm.c $(SOURCE_DIR)/src/lib/krb5/keytab/; \
 	$(CP) Solaris/kt_solaris.c $(SOURCE_DIR)/src/lib/krb5/keytab/; \
-	$(CP) Solaris/kt_solaris.h $(SOURCE_DIR)/src/lib/krb5/keytab/; \
+	$(CP) Solaris/private/krb5/keytab/kt_solaris.h $(SOURCE_DIR)/src/lib/krb5/keytab/; \
 	$(CP) Solaris/libgss_stubs.c $(SOURCE_DIR)/src/lib/gssapi/mechglue/; \
 	$(CP) Solaris/missing_interfaces.c $(SOURCE_DIR)/src/lib/krb5/; \
 	$(CP) Solaris/privacy_allowed.c $(SOURCE_DIR)/src/lib/krb5/; \
 	$(CP) Solaris/prof_solaris.c $(SOURCE_DIR)/src/lib/krb5/; \
-	$(CP) Solaris/prof_solaris.h $(SOURCE_DIR)/src/lib/krb5/; \
+	$(CP) Solaris/private/krb5/prof_solaris.h $(SOURCE_DIR)/src/lib/krb5/; \
 	$(CP) Solaris/rc_mem.c $(SOURCE_DIR)/src/lib/krb5/rcache; \
 	$(CP) Solaris/rc_mem.h $(SOURCE_DIR)/src/lib/krb5/rcache; \
 	$(CP) Solaris/safechown.c $(SOURCE_DIR)/src/lib/krb5/os; \

--- a/components/krb5/Solaris/kt_solaris.h	Wed Apr 27 14:28:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
- */
-
-/*
- * Solaris Kerberos
- * This is a private header file, therefore the interfaces that this file
- * declares are subject to change without prior notice.
- */
-
-#ifndef	_KT_SOLARIS_H
-#define	_KT_SOLARIS_H
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define	K5_KT_FLAG_AES_SUPPORT	1
-
-krb5_error_code k5_kt_add_ad_entries(krb5_context, char **, char *, krb5_kvno,
-    uint_t, char *, char *);
-
-krb5_error_code k5_kt_remove_by_realm(krb5_context, char *);
-
-krb5_error_code k5_kt_remove_by_svcprinc(krb5_context, char *);
-
-krb5_error_code k5_kt_ad_validate(krb5_context, char *, uint_t, boolean_t *);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _KT_SOLARIS_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/Solaris/private/krb5/keytab/kt_solaris.h	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/*
+ * Solaris Kerberos
+ * This is a private header file, therefore the interfaces that this file
+ * declares are subject to change without prior notice.
+ */
+
+#ifndef	_KT_SOLARIS_H
+#define	_KT_SOLARIS_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	K5_KT_FLAG_AES_SUPPORT	1
+
+krb5_error_code k5_kt_add_ad_entries(krb5_context, char **, char *, krb5_kvno,
+    uint_t, char *, char *);
+
+krb5_error_code k5_kt_remove_by_realm(krb5_context, char *);
+
+krb5_error_code k5_kt_remove_by_svcprinc(krb5_context, char *);
+
+krb5_error_code k5_kt_ad_validate(krb5_context, char *, uint_t, boolean_t *);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _KT_SOLARIS_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/Solaris/private/krb5/prof_solaris.h	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/*
+ * Solaris Kerberos
+ * This is a private header file, therefore the interfaces that this file
+ * declares are subject to change without prior notice.
+ */
+
+#ifndef	_PROF_SOLARIS_H
+#define	_PROF_SOLARIS_H
+
+#include <profile.h>
+#include <sys/types.h>
+
+#define	K5_PROFILE_VAL_SUCCESS					0
+#define	K5_PROFILE_VAL_DEF_REALM_CASE			1
+#define	K5_PROFILE_VAL_REALM_CASE				2
+#define	K5_PROFILE_VAL_NO_DEF_IN_REALM			3
+#define	K5_PROFILE_VAL_NO_DEF_REALM				4
+#define	K5_PROFILE_VAL_NULL_REALM				5
+#define	K5_PROFILE_VAL_NO_DOM_REALM_MAP			6
+#define	K5_PROFILE_VAL_KDC_NO_REALM				7
+#define	K5_PROFILE_VAL_ADMIN_NO_REALM			8
+#define	K5_PROFILE_VAL_DOM_REALM_CASE			9
+#define	K5_PROFILE_VAL_NO_REALM					10
+
+typedef struct _profile_options {
+		char *name;
+		int  *value;
+		int  found;
+} profile_options_boolean;
+
+typedef struct _profile_times {
+		char *name;
+		char **value;
+		int  found;
+} profile_option_strings;
+
+errcode_t
+profile_get_options_boolean(profile_t, char **, profile_options_boolean *);
+
+errcode_t
+profile_get_options_string(profile_t, char **, profile_option_strings *);
+
+long k5_profile_init(char *filename, profile_t *profile);
+long k5_profile_release(profile_t profile);
+void k5_profile_abandon(profile_t profile);
+long k5_profile_add_domain_mapping(profile_t profile, char *domain,
+    char *realm);
+long k5_profile_remove_domain_mapping(profile_t profile, char *realm);
+long k5_profile_get_realm_entry(profile_t profile, char *realm, char *name,
+    char ***ret_value);
+long k5_profile_add_realm_entry(profile_t profile, char *realm, char *name,
+    char **values);
+long k5_profile_get_libdefaults_entry(profile_t profile, char *name,
+    char **ret_value);
+long k5_profile_add_libdefaults_entry(profile_t profile, char *name,
+    char *value);
+long k5_profile_get_default_realm(profile_t profile, char **realm);
+long k5_profile_get_realms(profile_t profile, char ***realms);
+long k5_profile_add_realm(profile_t profile, char *realm, char *master,
+    char **kdcs, boolean_t set_change, boolean_t default_realm);
+long k5_profile_remove_xrealm_mapping(profile_t profile, char *realm);
+long k5_profile_remove_realm(profile_t profile, char *realm);
+long k5_profile_add_xrealm_mapping(profile_t profile, char *source,
+    char *target, char *inter);
+long k5_profile_validate(profile_t profile, char *realm, int *val_err,
+    char **val, boolean_t master_required, boolean_t kdc_required);
+long k5_profile_validate_get_error_msg(profile_t profile, int err, char *val,
+    char **err_msg);
+long k5_profile_set_libdefaults(profile_t profile, char *realm);
+
+#endif /* _PROF_SOLARIS_H */

--- a/components/krb5/Solaris/prof_solaris.h	Wed Apr 27 14:28:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- */
-
-/*
- * Solaris Kerberos
- * This is a private header file, therefore the interfaces that this file
- * declares are subject to change without prior notice.
- */
-
-#ifndef	_PROF_SOLARIS_H
-#define	_PROF_SOLARIS_H
-
-#include <profile.h>
-#include <sys/types.h>
-
-#define K5_PROFILE_VAL_SUCCESS                  0
-#define K5_PROFILE_VAL_DEF_REALM_CASE           1
-#define K5_PROFILE_VAL_REALM_CASE               2
-#define K5_PROFILE_VAL_NO_DEF_IN_REALM          3
-#define K5_PROFILE_VAL_NO_DEF_REALM             4
-#define K5_PROFILE_VAL_NULL_REALM               5
-#define K5_PROFILE_VAL_NO_DOM_REALM_MAP         6
-#define K5_PROFILE_VAL_KDC_NO_REALM             7
-#define K5_PROFILE_VAL_ADMIN_NO_REALM           8
-#define K5_PROFILE_VAL_DOM_REALM_CASE           9
-#define K5_PROFILE_VAL_NO_REALM                 10
-
-typedef struct _profile_options {
-       char *name;
-       int  *value;
-       int  found;
-} profile_options_boolean;
-
-typedef struct _profile_times {
-       char *name;
-       char **value;
-       int  found;
-} profile_option_strings;
-
-errcode_t
-profile_get_options_boolean(profile_t, char **, profile_options_boolean *);
-
-errcode_t
-profile_get_options_string(profile_t, char **, profile_option_strings *);
-
-long k5_profile_init(char *filename, profile_t *profile);
-long k5_profile_release(profile_t profile);
-void k5_profile_abandon(profile_t profile);
-long k5_profile_add_domain_mapping(profile_t profile, char *domain,
-    char *realm);
-long k5_profile_remove_domain_mapping(profile_t profile, char *realm);
-long k5_profile_get_realm_entry(profile_t profile, char *realm, char *name,
-    char ***ret_value);
-long k5_profile_add_realm_entry(profile_t profile, char *realm, char *name,
-    char **values);
-long k5_profile_get_libdefaults_entry(profile_t profile, char *name,
-    char **ret_value);
-long k5_profile_add_libdefaults_entry(profile_t profile, char *name,
-    char *value);
-long k5_profile_get_default_realm(profile_t profile, char **realm);
-long k5_profile_get_realms(profile_t profile, char ***realms);
-long k5_profile_add_realm(profile_t profile, char *realm, char *master,
-    char **kdcs, boolean_t set_change, boolean_t default_realm);
-long k5_profile_remove_xrealm_mapping(profile_t profile, char *realm);
-long k5_profile_remove_realm(profile_t profile, char *realm);
-long k5_profile_add_xrealm_mapping(profile_t profile, char *source,
-    char *target, char *inter);
-long k5_profile_validate(profile_t profile, char *realm, int *val_err,
-    char **val, boolean_t master_required, boolean_t kdc_required);
-long k5_profile_validate_get_error_msg(profile_t profile, int err, char *val,
-    char **err_msg);
-long k5_profile_set_libdefaults(profile_t profile, char *realm);
-
-#endif /* _PROF_SOLARIS_H */

--- a/components/krb5/krb5.p5m	Wed Apr 27 14:28:37 2016 -0700
+++ b/components/krb5/krb5.p5m	Wed Apr 27 16:11:34 2016 -0700
@@ -98,7 +98,7 @@
 link path=usr/include/kerberosv5/private/krb5/keytab/kt_solaris.h \
     target=../../../../../kerberos5/$(COMPONENT_VERSION)/include/kerberosv5/private/krb5/keytab/kt_solaris.h \
     mediator=kerberos5 mediator-implementation=MIT
-file Solaris/prof_solaris.h \
+file Solaris/private/krb5/prof_solaris.h \
     path=usr/include/kerberosv5/private/krb5/prof_solaris.h
 file path=usr/include/kerberosv5/profile.h
 file path=usr/include/kerberosv5/verto-module.h
@@ -123,7 +123,7 @@
     path=usr/kerberos5/$(COMPONENT_VERSION)/include/kerberosv5/com_err.h
 file usr/include/kerberosv5/krb5.h \
     path=usr/kerberos5/$(COMPONENT_VERSION)/include/kerberosv5/krb5.h
-file Solaris/kt_solaris.h \
+file Solaris/private/krb5/keytab/kt_solaris.h \
     path=usr/kerberos5/$(COMPONENT_VERSION)/include/kerberosv5/private/krb5/keytab/kt_solaris.h
 file usr/lib/$(MACH64)/libgss.so.1 \
     path=usr/kerberos5/$(COMPONENT_VERSION)/lib/$(MACH64)/libgss.so.1
@@ -192,6 +192,13 @@
 link path=usr/lib/$(MACH64)/libverto.so target=libverto.so.0.0
 link path=usr/lib/$(MACH64)/libverto.so.0 target=libverto.so.0.0
 file path=usr/lib/$(MACH64)/libverto.so.0.0
+file path=usr/lib/$(MACH64)/llib-lcom_err.ln
+link path=usr/lib/$(MACH64)/llib-lgss.ln target=llib-lgssapi_krb5.ln
+file path=usr/lib/$(MACH64)/llib-lgssapi_krb5.ln
+file path=usr/lib/$(MACH64)/llib-lk5crypto.ln
+file path=usr/lib/$(MACH64)/llib-lkadm5clnt.ln
+file path=usr/lib/$(MACH64)/llib-lkadm5srv.ln
+file path=usr/lib/$(MACH64)/llib-lkrb5.ln
 file path=usr/lib/$(MACH64)/pkgconfig/kadm-client.pc
 file path=usr/lib/$(MACH64)/pkgconfig/kadm-server.pc
 file path=usr/lib/$(MACH64)/pkgconfig/kdb.pc
@@ -256,6 +263,20 @@
 link path=usr/lib/libverto.so target=libverto.so.0.0
 link path=usr/lib/libverto.so.0 target=libverto.so.0.0
 file path=usr/lib/libverto.so.0.0
+file path=usr/lib/llib-lcom_err
+file path=usr/lib/llib-lcom_err.ln
+link path=usr/lib/llib-lgss target=llib-lgssapi_krb5
+link path=usr/lib/llib-lgss.ln target=llib-lgssapi_krb5.ln
+file path=usr/lib/llib-lgssapi_krb5
+file path=usr/lib/llib-lgssapi_krb5.ln
+file path=usr/lib/llib-lk5crypto
+file path=usr/lib/llib-lk5crypto.ln
+file path=usr/lib/llib-lkadm5clnt
+file path=usr/lib/llib-lkadm5clnt.ln
+file path=usr/lib/llib-lkadm5srv
+file path=usr/lib/llib-lkadm5srv.ln
+file path=usr/lib/llib-lkrb5
+file path=usr/lib/llib-lkrb5.ln
 file path=usr/lib/pkgconfig/kadm-client.pc
 file path=usr/lib/pkgconfig/kadm-server.pc
 file path=usr/lib/pkgconfig/kdb.pc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/llib-lcom_err	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <com_err.h>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/llib-lgssapi_krb5	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,30 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_ext.h>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/llib-lk5crypto	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <krb5.h>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/llib-lkadm5clnt	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <kadm5/admin.h>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/llib-lkadm5srv	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <kadm5/admin.h>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/krb5/llib-lkrb5	Wed Apr 27 16:11:34 2016 -0700
@@ -0,0 +1,31 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <krb5.h>
+#include <private/krb5/keytab/kt_solaris.h>
+#include <private/krb5/prof_solaris.h>