diff -u fbsd-indent.orig/args.c fbsd-indent/args.c
--- fbsd-indent.orig/args.c	2017-03-21 20:39:33.839786877 -0400
+++ fbsd-indent/args.c	2017-03-21 20:39:30.819771937 -0400
@@ -40,7 +40,9 @@
 #endif
 
 #include <sys/cdefs.h>
+#if 0
 __FBSDID("$FreeBSD$");
+#endif
 
 /*
  * Argument scanning and profile reading code.  Default parameters are set
diff -u fbsd-indent.orig/indent.c fbsd-indent/indent.c
--- fbsd-indent.orig/indent.c	2017-03-21 20:39:30.939772531 -0400
+++ fbsd-indent/indent.c	2017-03-21 20:39:27.951757722 -0400
@@ -41,6 +41,8 @@
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#define nitems(x) (sizeof(x)/sizeof(*(x)))
+
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
@@ -48,10 +50,14 @@
 #endif
 
 #include <sys/cdefs.h>
+#if 0
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <sys/param.h>
+#if 0
 #include <sys/capsicum.h>
+#endif
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -76,7 +82,9 @@
 int
 main(int argc, char **argv)
 {
+#if 0
     cap_rights_t rights;
+#endif
 
     int         dec_ind;	/* current indentation for declarations */
     int         di_stack[20];	/* a stack of structure indentation levels */
@@ -241,6 +249,7 @@
 	}
     }
 
+#if 0
     /* Restrict input/output descriptors and enter Capsicum sandbox. */
     cap_rights_init(&rights, CAP_FSTAT, CAP_WRITE);
     if (cap_rights_limit(fileno(output), &rights) < 0 && errno != ENOSYS)
@@ -250,6 +259,7 @@
 	err(EXIT_FAILURE, "unable to limit rights for %s", in_name);
     if (cap_enter() < 0 && errno != ENOSYS)
 	err(EXIT_FAILURE, "unable to enter capability mode");
+#endif
 
     if (ps.com_ind <= 1)
 	ps.com_ind = 2;		/* dont put normal comments before column 2 */
diff -u fbsd-indent.orig/indent_globs.h fbsd-indent/indent_globs.h
--- fbsd-indent.orig/indent_globs.h	2017-03-21 20:39:30.999772828 -0400
+++ fbsd-indent/indent_globs.h	2017-03-21 20:39:28.011758020 -0400
@@ -220,7 +220,7 @@
     char        font[4];
     char        size;
     int         allcaps:1;
-} __aligned(sizeof(int));
+} /*__aligned(sizeof(int))*/;
 char       *chfont(struct fstate *, struct fstate *, char *);
 
 struct fstate
diff -u fbsd-indent.orig/io.c fbsd-indent/io.c
--- fbsd-indent.orig/io.c	2017-03-21 20:39:33.287784148 -0400
+++ fbsd-indent/io.c	2017-03-21 22:32:20.796118700 -0400
@@ -40,7 +40,9 @@
 #endif
 
 #include <sys/cdefs.h>
+#if 0
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <ctype.h>
 #include <err.h>
@@ -366,7 +368,7 @@
 		had_eof = true;
 		break;
 	}
-	*p++ = i;
+	*p++ = i > 0x7F ? 0x7F : i;
 	if (i == '\n')
 		break;
     }
diff -u fbsd-indent.orig/lexi.c fbsd-indent/lexi.c
--- fbsd-indent.orig/lexi.c	2017-03-21 20:39:33.715786264 -0400
+++ fbsd-indent/lexi.c	2017-03-21 20:39:30.703771361 -0400
@@ -39,7 +39,9 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
+#if 0
 __FBSDID("$FreeBSD$");
+#endif
 
 /*
  * Here we have the token scanner for indent.  It scans off one token and puts
diff -u fbsd-indent.orig/parse.c fbsd-indent/parse.c
--- fbsd-indent.orig/parse.c	2017-03-21 20:39:33.471785058 -0400
+++ fbsd-indent/parse.c	2017-03-21 20:39:30.447770094 -0400
@@ -40,7 +40,9 @@
 #endif
 
 #include <sys/cdefs.h>
+#if 0
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <err.h>
 #include <stdio.h>
diff -u fbsd-indent.orig/pr_comment.c fbsd-indent/pr_comment.c
--- fbsd-indent.orig/pr_comment.c	2017-03-21 20:39:33.599785690 -0400
+++ fbsd-indent/pr_comment.c	2017-03-21 20:39:30.571770708 -0400
@@ -40,7 +40,9 @@
 #endif
 
 #include <sys/cdefs.h>
+#if 0
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <err.h>
 #include <stdio.h>
Common subdirectories: fbsd-indent.orig/tests and fbsd-indent/tests