31 files changed, 93 insertions, 68 deletions

diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index 3a425ccd6cddb..7e2f955803180 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -22,10 +22,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 15b9d9ce4728c..6d1e0a86736b9 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -22,10 +22,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index 2f5205d8a9545..fc929c43a4891 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_delete_def_file -- remove a default acl from a file
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 7169c6f953670..e867ff606b0db 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index 3962da6ee48bb..f5bdbede9c5cf 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index b4aeb1ab297eb..6de41da8abfbb 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_free -- free ACL objects from user memory
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index 78a8bd047be7e..59d9142a52838 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_from_text: Convert a text-form ACL from a string to an acl_t.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 94bb0a2494f23..87a51ddf168a9 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_get_file - syscall wrapper for retrieving ACL by filename
@@ -36,6 +34,9 @@
  * acl_get_tag_type() returns the tag type for the ACL entry entry_d
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index 08b74487b075b..6ce40de479694 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -22,14 +22,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_init -- return a fresh acl structure
  * acl_dup -- duplicate an acl and return the new copy
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index 21a8a77dd8930..c3375e000c213 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -22,10 +22,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index c9a28850a9359..b9e68606da095 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_set_file -- set a file/directory ACL by name
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_size.c b/lib/libc/posix1e/acl_size.c
index 0d972efc393f0..e8bd0a423fbfa 100644
--- a/lib/libc/posix1e/acl_size.c
+++ b/lib/libc/posix1e/acl_size.c
@@ -22,10 +22,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index e665d8e8720b3..93e98bb001df6 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -22,14 +22,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * Support functionality for the POSIX.1e ACL interface
  * These calls are intended only to be called within the library.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index 50b294bcad638..ea0770def453d 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -22,14 +22,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_to_text - return a text string with a text representation of the acl
  * in it.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index e8d2df77aebca..179e47e1e466c 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * acl_valid -- POSIX.1e ACL check routine
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/acl.h>
diff --git a/lib/libc/posix1e/cap_clear.c b/lib/libc/posix1e/cap_clear.c
index 399886fb4fb82..076e29571f397 100644
--- a/lib/libc/posix1e/cap_clear.c
+++ b/lib/libc/posix1e/cap_clear.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_cmp.c b/lib/libc/posix1e/cap_cmp.c
index 77bb6ca5a24e6..6ca201e50438a 100644
--- a/lib/libc/posix1e/cap_cmp.c
+++ b/lib/libc/posix1e/cap_cmp.c
@@ -20,14 +20,14 @@
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
-
 /*
  * Capabiltiy comparison functions cap_subset, cap_equal.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /* define this to pull in the cap macros the kernel uses */
 #include <sys/types.h>
 #define _CAPABILITY_NEEDMACROS
diff --git a/lib/libc/posix1e/cap_copy.c b/lib/libc/posix1e/cap_copy.c
index 21822c065ab13..fdfd73e34d6c6 100644
--- a/lib/libc/posix1e/cap_copy.c
+++ b/lib/libc/posix1e/cap_copy.c
@@ -20,10 +20,7 @@
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
-
 /*
  * TrustedBSD implementation of cap_copy_ext()/cap_copy_int()
  *
@@ -35,6 +32,9 @@
  * segfault.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/capability.h>
 
diff --git a/lib/libc/posix1e/cap_dup.c b/lib/libc/posix1e/cap_dup.c
index 50db98113ede9..0268c8ce553cf 100644
--- a/lib/libc/posix1e/cap_dup.c
+++ b/lib/libc/posix1e/cap_dup.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_free.c b/lib/libc/posix1e/cap_free.c
index 20ec1936d012a..52bf1f3fbf26a 100644
--- a/lib/libc/posix1e/cap_free.c
+++ b/lib/libc/posix1e/cap_free.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_get_fd.c b/lib/libc/posix1e/cap_get_fd.c
index 788c7eadc2e46..1ac8fedf73e90 100644
--- a/lib/libc/posix1e/cap_get_fd.c
+++ b/lib/libc/posix1e/cap_get_fd.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_get_file.c b/lib/libc/posix1e/cap_get_file.c
index d1ff64c88b2f5..3df6260de5561 100644
--- a/lib/libc/posix1e/cap_get_file.c
+++ b/lib/libc/posix1e/cap_get_file.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_get_flag.c b/lib/libc/posix1e/cap_get_flag.c
index 3694cbb829ce9..d5bae2a676647 100644
--- a/lib/libc/posix1e/cap_get_flag.c
+++ b/lib/libc/posix1e/cap_get_flag.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #define _CAPABILITY_NEEDMACROS
diff --git a/lib/libc/posix1e/cap_get_proc.c b/lib/libc/posix1e/cap_get_proc.c
index 30afaef019a35..d4eb92a7e95e5 100644
--- a/lib/libc/posix1e/cap_get_proc.c
+++ b/lib/libc/posix1e/cap_get_proc.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_init.c b/lib/libc/posix1e/cap_init.c
index 61c0d59962e7a..23b510011becc 100644
--- a/lib/libc/posix1e/cap_init.c
+++ b/lib/libc/posix1e/cap_init.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_set_fd.c b/lib/libc/posix1e/cap_set_fd.c
index f6791b93d48b6..3bcafd5c9cabc 100644
--- a/lib/libc/posix1e/cap_set_fd.c
+++ b/lib/libc/posix1e/cap_set_fd.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_set_file.c b/lib/libc/posix1e/cap_set_file.c
index d1e5de1c59c24..26f9bb4e3becf 100644
--- a/lib/libc/posix1e/cap_set_file.c
+++ b/lib/libc/posix1e/cap_set_file.c
@@ -22,19 +22,19 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
 #include "un-namespace.h"
 
-
 int
 cap_set_file(const char *path_p, cap_t cap_p)
 {
diff --git a/lib/libc/posix1e/cap_set_flag.c b/lib/libc/posix1e/cap_set_flag.c
index 79e438ff48699..312573f6c57cb 100644
--- a/lib/libc/posix1e/cap_set_flag.c
+++ b/lib/libc/posix1e/cap_set_flag.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 /* need capability.h macros */
diff --git a/lib/libc/posix1e/cap_set_proc.c b/lib/libc/posix1e/cap_set_proc.c
index 724add6a3c4f4..6ef33a9143902 100644
--- a/lib/libc/posix1e/cap_set_proc.c
+++ b/lib/libc/posix1e/cap_set_proc.c
@@ -22,18 +22,18 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *       $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
 #include "un-namespace.h"
-
 #include <sys/errno.h>
 
 int
diff --git a/lib/libc/posix1e/cap_text.c b/lib/libc/posix1e/cap_text.c
index 05cfe0da385b0..87a3080cac546 100644
--- a/lib/libc/posix1e/cap_text.c
+++ b/lib/libc/posix1e/cap_text.c
@@ -22,13 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 /*
  * TrustedBSD Project - support for POSIX.1e process capabilities
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "namespace.h"
 #include <sys/capability.h>
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index df147e0e4ff3f..e9d28a3e48265 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -23,14 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * TrustedBSD: Utility functions for extended attributes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/extattr.h>