diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 819bcef12518..6ecc77b9832e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1153 2008/05/26 16:56:44 christos Exp $
+#	$NetBSD: mi,v 1.1154 2008/05/28 12:28:12 ad Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -169,6 +169,7 @@
 ./usr/include/atf/ui.hpp			comp-obsolete		obsolete
 ./usr/include/atf/user.hpp			comp-obsolete		obsolete
 ./usr/include/atf/utils.hpp			comp-obsolete		obsolete
+./usr/include/atomic.h				comp-c-include
 ./usr/include/bfd				comp-obsolete		obsolete
 ./usr/include/bfd/ansidecl.h			comp-obsolete		obsolete
 ./usr/include/bfd/bfd.h				comp-obsolete		obsolete
diff --git a/include/Makefile b/include/Makefile
index c8ef1832871d..7723d8584188 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.130 2007/09/07 18:56:04 rmind Exp $
+#	$NetBSD: Makefile,v 1.131 2008/05/28 12:28:12 ad Exp $
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -7,7 +7,8 @@ NOOBJ=		# defined
 
 # Missing: mp.h
 
-INCS=	a.out.h aio.h ar.h assert.h bitstring.h bm.h complex.h cpio.h ctype.h \
+INCS=	a.out.h aio.h ar.h assert.h atomic.h \
+	bitstring.h bm.h complex.h cpio.h ctype.h \
 	db.h dirent.h disktab.h dlfcn.h err.h errno.h fmtmsg.h fnmatch.h \
 	fstab.h fts.h ftw.h getopt.h glob.h grp.h ifaddrs.h iconv.h \
 	inttypes.h iso646.h kvm.h langinfo.h libgen.h \
diff --git a/include/atomic.h b/include/atomic.h
new file mode 100644
index 000000000000..71c6dcdaef5b
--- /dev/null
+++ b/include/atomic.h
@@ -0,0 +1,29 @@
+/*	$NetBSD: atomic.h,v 1.1 2008/05/28 12:28:12 ad Exp $	*/
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/atomic.h>