diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
index 62d64353bec..66c8bce3de0 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
@@ -446,10 +446,6 @@ extern char hw_serial[];
 extern int ddi_strtoul(const char *str, char **nptr, int base,
     unsigned long *result);
 
-#ifdef	__cplusplus
-}
-#endif
-
 /* ZFS Boot Related stuff. */
 
 struct _buf {
@@ -508,4 +504,8 @@ struct file {
 #define	ERESTART	(-1)
 #endif
 
+#ifdef	__cplusplus
+}
+#endif
+
 #endif	/* _SYS_ZFS_CONTEXT_H */
diff --git a/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
index 62d64353bec..66c8bce3de0 100644
--- a/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
@@ -446,10 +446,6 @@ extern char hw_serial[];
 extern int ddi_strtoul(const char *str, char **nptr, int base,
     unsigned long *result);
 
-#ifdef	__cplusplus
-}
-#endif
-
 /* ZFS Boot Related stuff. */
 
 struct _buf {
@@ -508,4 +504,8 @@ struct file {
 #define	ERESTART	(-1)
 #endif
 
+#ifdef	__cplusplus
+}
+#endif
+
 #endif	/* _SYS_ZFS_CONTEXT_H */