diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index f31058a2353b..91930a44008c 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -27,6 +27,9 @@
  *	$FreeBSD$
  */
 
+#ifndef _DEVINFO_H_INCLUDED
+#define _DEVINFO_H_INCLUDED
+
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
@@ -77,6 +80,8 @@ struct devinfo_res {
 	/* XXX add flags */
 };
 
+__BEGIN_DECLS
+
 /*
  * Acquire a coherent copy of the kernel's device and resource tables.
  * This must return success (zero) before any other interfaces will
@@ -136,3 +141,7 @@ extern int
 extern int
 	devinfo_foreach_rman(int (* fn)(struct devinfo_rman *rman, void *arg),
 	    void *arg);
+
+__END_DECLS
+
+#endif /* ! _DEVINFO_H_INCLUDED */