diff --git a/sys/conf/files b/sys/conf/files
index e1bfd05192fa..6be0f989d1bb 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.736 2005/10/15 17:29:11 yamt Exp $
+#	$NetBSD: files,v 1.737 2005/10/19 09:04:23 dyoung Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -512,7 +512,8 @@ file	dev/ic/wi.c			wi
 # Atheros 5210/5211/5212 multi-mode 802.11
 #
 # XXX: All the AH_ stuff should be renamed to ATHHAL_!!! 
-defflag	opt_ah.h	AH_ASSERT AH_DEBUG AH_DEBUG_ALQ AH_REGOPS_FUNC
+defflag	opt_athhal.h	AH_ASSERT AH_DEBUG AH_DEBUG_ALQ AH_REGOPS_FUNC
+
 device	ath: arp, wlan, ifnet
 file	dev/ic/ath.c					ath
 file	dev/ic/ath_netbsd.c				ath
diff --git a/sys/contrib/dev/ic/athhal_osdep.c b/sys/contrib/dev/ic/athhal_osdep.c
index 09cb5eef41c8..3fd5ac54e9ee 100644
--- a/sys/contrib/dev/ic/athhal_osdep.c
+++ b/sys/contrib/dev/ic/athhal_osdep.c
@@ -33,9 +33,9 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: athhal_osdep.c,v 1.4 2005/09/13 05:50:29 martin Exp $
+ * $Id: athhal_osdep.c,v 1.5 2005/10/19 09:04:23 dyoung Exp $
  */
-#include "opt_ah.h"
+#include "opt_athhal.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>