diff --git a/sys/dev/ic/aac_tables.h b/sys/dev/ic/aac_tables.h
index f5bdb2ac8c60..bab747faaf93 100644
--- a/sys/dev/ic/aac_tables.h
+++ b/sys/dev/ic/aac_tables.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: aac_tables.h,v 1.1 2002/04/26 02:06:16 ad Exp $	*/
+/*	$NetBSD: aac_tables.h,v 1.2 2004/08/23 23:17:54 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -31,6 +31,9 @@
  * via OpenBSD: aac_tables.h,v 1.1 2000/11/10 09:39:35 niklas Exp
  */
 
+#ifndef _DEV_IC_AAC_TABLES_H_
+#define	_DEV_IC_AAC_TABLES_H_
+
 /*
  * Status codes for block read/write commands, etc.
  *
@@ -78,7 +81,7 @@ const struct aac_code_lookup aac_command_status_table[] = {
 
 #define AAC_COMMAND_STATUS(x)	aac_describe_code(aac_command_status_table, x)
 
-const struct aac_code_lookup aac_cpu_variant[] = {
+static const struct aac_code_lookup aac_cpu_variant[] = {
 	{ "i960JX",			CPUI960_JX },
 	{ "i960CX",			CPUI960_CX },
 	{ "i960HX",			CPUI960_HX },
@@ -91,7 +94,7 @@ const struct aac_code_lookup aac_cpu_variant[] = {
 	{ "Unknown processor",		0 }
 };
 
-const struct aac_code_lookup aac_battery_platform[] = {
+static const struct aac_code_lookup aac_battery_platform[] = {
 	{ "required battery present",		PLATFORM_BAT_REQ_PRESENT },
 	{ "REQUIRED BATTERY NOT PRESENT",	PLATFORM_BAT_REQ_NOTPRESENT },
 	{ "optional battery present",		PLATFORM_BAT_OPT_PRESENT },
@@ -118,3 +121,5 @@ const struct aac_code_lookup aac_container_types[] = {
 	{ NULL,			0 },
 	{ "unknown",		0 }
 };
+
+#endif /* _DEV_IC_AAC_TABLES_H_ */
diff --git a/sys/dev/ic/ac97var.h b/sys/dev/ic/ac97var.h
index 06a14baac410..30f5cd96c1e9 100644
--- a/sys/dev/ic/ac97var.h
+++ b/sys/dev/ic/ac97var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ac97var.h,v 1.8 2003/07/08 10:06:30 itojun Exp $	*/
+/*	$NetBSD: ac97var.h,v 1.9 2004/08/23 23:17:54 thorpej Exp $	*/
 /*	$OpenBSD: ac97.h,v 1.4 2000/07/19 09:01:35 csapuntz Exp $	*/
 
 /*
@@ -28,6 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _DEV_IC_AC97VAR_H_
+#define	_DEV_IC_AC97VAR_H_
+
 struct ac97_codec_if;
 
 /* 
@@ -75,3 +78,5 @@ struct ac97_codec_if {
 };
 
 int ac97_attach __P((struct ac97_host_if *));
+
+#endif /* _DEV_IC_AC97VAR_H_ */