diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c
index 965ad72278a1..ddbbae619aeb 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c
@@ -1,49 +1,49 @@
 /*
  * 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 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #include <stdio.h>
 
 typedef void f(int x);
 
 static void
 f1(int i)
 {
 	printf("%d\n", i);
 }
 
 static void
 f2(f func, int i)
 {
 	func(i);
 }
 
 int
-main()
+main(void)
 {
 	f2(f1, 3);
 
 	return (0);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c
index 7fe7b16d1d78..7786d58a4c65 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c
@@ -1,93 +1,93 @@
 /*
  * 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 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #include <sys/cdefs.h>
 
 typedef void f(char *);
 
 static void
 f_a(char *a __unused)
 {
 }
 
 static void
 f_b(char *a __unused)
 {
 }
 
 static void
 f_c(char *a __unused)
 {
 }
 
 static void
 f_d(char *a __unused)
 {
 }
 
 static void
 f_e(char *a __unused)
 {
 }
 
 static void
 fN(f func, char *a, int i __unused)
 {
 	func(a);
 }
 
 static void
 fN2(f func, char *a, int i __unused)
 {
 	func(a);
 }
 
 int
-main()
+main(void)
 {
 	/*
 	 * Avoid length of 1, 2, 4, or 8 bytes so DTrace will treat the data as
 	 * a byte array.
 	 */
 	char a[] = {(char)-7, (char)201, (char)0, (char)0, (char)28, (char)1};
 	char b[] = {(char)84, (char)69, (char)0, (char)0, (char)28, (char)0};
 	char c[] = {(char)84, (char)69, (char)0, (char)0, (char)28, (char)1};
 	char d[] = {(char)-7, (char)201, (char)0, (char)0, (char)29, (char)0};
 	char e[] = {(char)84, (char)69, (char)0, (char)0, (char)28, (char)0};
 
 	fN(f_a, a, 1);
 	fN(f_b, b, 0);
 	fN(f_d, d, 102);
 	fN2(f_e, e, -2);
 	fN(f_c, c, 0);
 	fN(f_a, a, -1);
 	fN(f_d, d, 101);
 	fN(f_e, e, -2);
 	fN(f_e, e, 2);
 	fN2(f_e, e, 2);
 
 	return (0);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
index 5680f2e177f6..d9b7f5a184a2 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
@@ -1,59 +1,60 @@
 /*
  * 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 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 /*
  * The canonical name should be 'go' since we prefer symbol names with fewer
  * leading underscores.
  */
 
-#pragma weak _go = go
-
+extern int _go(int);
 int go(int);
 
 int
 go(int a)
 {
 	return (a + 1);
 }
 
 static void
 handle(int sig __unused)
 {
 	_go(1);
 	exit(0);
 }
 
 int
 main(void)
 {
 	(void) signal(SIGUSR1, handle);
 	for (;;)
 		getpid();
 }
+
+#pragma weak _go = go
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
index 24a28420f3ef..49f486a460a3 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
@@ -1,57 +1,59 @@
 /*
  * 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 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 /*
  * The canonical name should be 'go' since we prefer symbol names with fewer
  * leading underscores.
  */
 
+extern int _go(int);
+
 static int __unused
 go(int a)
 {
 	return (a + 1);
 }
 
-#pragma weak _go = go
-
 static void
 handle(int sig __unused)
 {
 	_go(1);
 	exit(0);
 }
 
 int
 main(void)
 {
 	(void) signal(SIGUSR1, handle);
 	for (;;)
 		getpid();
 }
+
+#pragma weak _go = go