diff --git a/bin/rndc/util.c b/bin/rndc/util.c
index 8de75740b9..7716451da0 100644
--- a/bin/rndc/util.c
+++ b/bin/rndc/util.c
@@ -45,7 +45,7 @@ notify(const char *fmt, ...) {
 	}
 }
 
-void            
+void
 fatal(const char *format, ...) {
 	va_list args;
 
@@ -55,4 +55,4 @@ fatal(const char *format, ...) {
 	va_end(args);
 	fprintf(stderr, "\n");
 	exit(1);
-}               
+}
diff --git a/bin/tests/entropy2_test.c b/bin/tests/entropy2_test.c
index 90139884e8..76f22da78d 100644
--- a/bin/tests/entropy2_test.c
+++ b/bin/tests/entropy2_test.c
@@ -34,20 +34,20 @@
 
 static void
 hex_dump(const char *msg, void *data, unsigned int length) {
-        unsigned int len;
+	unsigned int len;
 	unsigned char *base;
 	isc_boolean_t first = ISC_TRUE;
 
 	base = data;
 
-        printf("DUMP of %d bytes:  %s\n\t", length, msg);
-        for (len = 0; len < length; len++) {
-                if (len % 16 == 0 && !first)
+	printf("DUMP of %d bytes:  %s\n\t", length, msg);
+	for (len = 0; len < length; len++) {
+		if (len % 16 == 0 && !first)
 			printf("\n\t");
-                printf("%02x ", base[len]);
+		printf("%02x ", base[len]);
 		first = ISC_FALSE;
-        }
-        printf("\n");
+	}
+	printf("\n");
 }
 
 static void
diff --git a/bin/tests/entropy_test.c b/bin/tests/entropy_test.c
index 7bdcf29d56..273050ee2e 100644
--- a/bin/tests/entropy_test.c
+++ b/bin/tests/entropy_test.c
@@ -32,20 +32,20 @@
 
 static void
 hex_dump(const char *msg, void *data, unsigned int length) {
-        unsigned int len;
+	unsigned int len;
 	unsigned char *base;
 	isc_boolean_t first = ISC_TRUE;
 
 	base = data;
 
-        printf("DUMP of %d bytes:  %s\n\t", length, msg);
-        for (len = 0; len < length; len++) {
-                if (len % 16 == 0 && !first)
+	printf("DUMP of %d bytes:  %s\n\t", length, msg);
+	for (len = 0; len < length; len++) {
+		if (len % 16 == 0 && !first)
 			printf("\n\t");
-                printf("%02x ", base[len]);
+		printf("%02x ", base[len]);
 		first = ISC_FALSE;
-        }
-        printf("\n");
+	}
+	printf("\n");
 }
 
 static void
diff --git a/bin/tests/system/builtin/Makefile.in b/bin/tests/system/builtin/Makefile.in
index 1d2f60ac83..be40c35cbb 100644
--- a/bin/tests/system/builtin/Makefile.in
+++ b/bin/tests/system/builtin/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index a718e3a145..af0c6f7fbf 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -167,7 +167,7 @@ main(int argc, char *argv[]) {
 		unsigned char *p = b;
 		while (p < bp) {
 			unsigned int len;
-			
+
 			if (p + 2 > bp) {
 				printf("premature end of packet\n");
 				exit(1);
@@ -228,10 +228,10 @@ process_message(isc_buffer_t *source) {
 		 * XXXMLG
 		 * Changing this here is a hack, and should not be done in
 		 * reasonable application code, ever.
-	 	*/
+		*/
 		message->from_to_wire = DNS_MESSAGE_INTENTRENDER;
 
- 		for (i = 0; i < DNS_SECTION_MAX; i++)
+		for (i = 0; i < DNS_SECTION_MAX; i++)
 			message->counts[i] = 0;  /* Another hack XXX */
 
 		result = dns_compress_init(&cctx, -1, mctx);
diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index c780aef5d1..0ee37d28bb 100644
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2011, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index 37b9cdd5ba..cec8b5e550 100644
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -51,7 +51,7 @@
 #define ALIST_TAG		"*alist*"
 #define MAX_INDENT		64
 
-static char spaces[MAX_INDENT + 1] = 
+static char spaces[MAX_INDENT + 1] =
 	"                                                                ";
 
 isccc_sexpr_t *
diff --git a/lib/lwres/win32/socket.c b/lib/lwres/win32/socket.c
index 31b43939d8..9341f48426 100644
--- a/lib/lwres/win32/socket.c
+++ b/lib/lwres/win32/socket.c
@@ -26,9 +26,9 @@ InitSockets(void) {
 	WORD wVersionRequested;
 	WSADATA wsaData;
 	int err;
- 
+
 	wVersionRequested = MAKEWORD(2, 0);
- 
+
 	err = WSAStartup( wVersionRequested, &wsaData );
 	if (err != 0) {
 		fprintf(stderr, "WSAStartup() failed: %d\n", err);