diff --git a/cmd/zpool/zpool_iter.c b/cmd/zpool/zpool_iter.c
index 2f0daefd55..bf947d307e 100644
--- a/cmd/zpool/zpool_iter.c
+++ b/cmd/zpool/zpool_iter.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <libintl.h>
 #include <libuutil.h>
diff --git a/lib/libefi/include/sys/efi_partition.h b/lib/libefi/include/sys/efi_partition.h
index 4ffa422118..ff38df5e79 100644
--- a/lib/libefi/include/sys/efi_partition.h
+++ b/lib/libefi/include/sys/efi_partition.h
@@ -218,7 +218,11 @@ struct partition64 {
 /*
  * Number of EFI partitions
  */
+#if defined(__linux__)
+#define	EFI_NUMPAR	128 /* Expected by parted-1.8.1 */
+#else
 #define	EFI_NUMPAR	9
+#endif
 
 #ifndef _KERNEL
 extern	int	efi_alloc_and_init(int, uint32_t, struct dk_gpt **);
diff --git a/lib/libefi/include/sys/uuid.h b/lib/libefi/include/sys/uuid.h
index 683643e312..9ce872e345 100644
--- a/lib/libefi/include/sys/uuid.h
+++ b/lib/libefi/include/sys/uuid.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_UUID_H
 #define	_SYS_UUID_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/lib/libnvpair/nvpair_alloc_system.c b/lib/libnvpair/nvpair_alloc_system.c
index e765577959..f45dc5f0b9 100644
--- a/lib/libnvpair/nvpair_alloc_system.c
+++ b/lib/libnvpair/nvpair_alloc_system.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <rpc/types.h>
 #include <sys/nvpair.h>
diff --git a/lib/libuutil/include/libuutil_common.h b/lib/libuutil/include/libuutil_common.h
index 9ebaaedfd2..52ac4887f7 100644
--- a/lib/libuutil/include/libuutil_common.h
+++ b/lib/libuutil/include/libuutil_common.h
@@ -27,7 +27,7 @@
 #ifndef	_LIBUUTIL_COMMON_H
 #define	_LIBUUTIL_COMMON_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <libuutil.h>
 #include <libuutil_impl.h>
diff --git a/lib/libuutil/include/libuutil_impl.h b/lib/libuutil/include/libuutil_impl.h
index 9466e59745..f978b475ef 100644
--- a/lib/libuutil/include/libuutil_impl.h
+++ b/lib/libuutil/include/libuutil_impl.h
@@ -27,7 +27,7 @@
 #ifndef	_LIBUUTIL_IMPL_H
 #define	_LIBUUTIL_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <libuutil.h>
 #include <pthread.h>
@@ -40,11 +40,11 @@ extern "C" {
 #endif
 
 void uu_set_error(uint_t);
-#pragma rarely_called(uu_set_error)
+
 
 /*PRINTFLIKE1*/
 void uu_panic(const char *format, ...);
-#pragma rarely_called(uu_panic)
+
 
 struct uu_dprintf {
 	char	*uud_name;
diff --git a/lib/libuutil/uu_avl.c b/lib/libuutil/uu_avl.c
index 308e9208fe..040008883a 100644
--- a/lib/libuutil/uu_avl.c
+++ b/lib/libuutil/uu_avl.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/lib/libuutil/uu_dprintf.c b/lib/libuutil/uu_dprintf.c
index 5b990a52b5..5d5fb84a83 100644
--- a/lib/libuutil/uu_dprintf.c
+++ b/lib/libuutil/uu_dprintf.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/lib/libuutil/uu_ident.c b/lib/libuutil/uu_ident.c
index 9a643845f8..382139316e 100644
--- a/lib/libuutil/uu_ident.c
+++ b/lib/libuutil/uu_ident.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/lib/libuutil/uu_list.c b/lib/libuutil/uu_list.c
index 35c7ba8001..c3a447d01d 100644
--- a/lib/libuutil/uu_list.c
+++ b/lib/libuutil/uu_list.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/lib/libuutil/uu_open.c b/lib/libuutil/uu_open.c
index 7256662e38..cf5c5450b8 100644
--- a/lib/libuutil/uu_open.c
+++ b/lib/libuutil/uu_open.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/lib/libuutil/uu_pname.c b/lib/libuutil/uu_pname.c
index 3307a26dc4..a6a0f22661 100644
--- a/lib/libuutil/uu_pname.c
+++ b/lib/libuutil/uu_pname.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/lib/libuutil/uu_strtoint.c b/lib/libuutil/uu_strtoint.c
index 8fd1148365..494e0a5b93 100644
--- a/lib/libuutil/uu_strtoint.c
+++ b/lib/libuutil/uu_strtoint.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include "libuutil_common.h"
 
diff --git a/module/avl/include/sys/avl_impl.h b/module/avl/include/sys/avl_impl.h
index 620685f370..fddf76906d 100644
--- a/module/avl/include/sys/avl_impl.h
+++ b/module/avl/include/sys/avl_impl.h
@@ -27,7 +27,7 @@
 #ifndef	_AVL_IMPL_H
 #define	_AVL_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 /*
  * This is a private header file.  Applications should not directly include
diff --git a/module/nvpair/include/sys/nvpair_impl.h b/module/nvpair/include/sys/nvpair_impl.h
index f12dbbfe6e..b851ddd54f 100644
--- a/module/nvpair/include/sys/nvpair_impl.h
+++ b/module/nvpair/include/sys/nvpair_impl.h
@@ -27,7 +27,7 @@
 #ifndef	_NVPAIR_IMPL_H
 #define	_NVPAIR_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/module/nvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c
index b1128eeb9b..33e3c0d007 100644
--- a/module/nvpair/nvpair_alloc_fixed.c
+++ b/module/nvpair/nvpair_alloc_fixed.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/stropts.h>
 #include <sys/isa_defs.h>
diff --git a/module/unicode/include/sys/u8_textprep.h b/module/unicode/include/sys/u8_textprep.h
index e30f064b2d..f8b5bed6e4 100644
--- a/module/unicode/include/sys/u8_textprep.h
+++ b/module/unicode/include/sys/u8_textprep.h
@@ -26,7 +26,7 @@
 #ifndef	_SYS_U8_TEXTPREP_H
 #define	_SYS_U8_TEXTPREP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/isa_defs.h>
 #include <sys/types.h>
diff --git a/module/unicode/include/sys/u8_textprep_data.h b/module/unicode/include/sys/u8_textprep_data.h
index de68660961..03f71f26c9 100644
--- a/module/unicode/include/sys/u8_textprep_data.h
+++ b/module/unicode/include/sys/u8_textprep_data.h
@@ -68,7 +68,7 @@
 #ifndef _SYS_U8_TEXTPREP_DATA_H
 #define	_SYS_U8_TEXTPREP_DATA_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/types.h>
 
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 8faf1a97e4..34b0b9a8b9 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 
 /*
diff --git a/module/unicode/uconv.c b/module/unicode/uconv.c
index fd65fc99b5..b996e1f60e 100644
--- a/module/unicode/uconv.c
+++ b/module/unicode/uconv.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 /*
  * Unicode encoding conversion functions among UTF-8, UTF-16, and UTF-32.
diff --git a/module/zfs/gzip.c b/module/zfs/gzip.c
index b257d4af75..aa0254806a 100644
--- a/module/zfs/gzip.c
+++ b/module/zfs/gzip.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/debug.h>
 #include <sys/types.h>
diff --git a/module/zfs/include/sys/rrwlock.h b/module/zfs/include/sys/rrwlock.h
index 19a43c97fc..798a015d19 100644
--- a/module/zfs/include/sys/rrwlock.h
+++ b/module/zfs/include/sys/rrwlock.h
@@ -26,7 +26,7 @@
 #ifndef	_SYS_RR_RW_LOCK_H
 #define	_SYS_RR_RW_LOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/module/zfs/include/sys/unique.h b/module/zfs/include/sys/unique.h
index 2ef3093edf..d971752867 100644
--- a/module/zfs/include/sys/unique.h
+++ b/module/zfs/include/sys/unique.h
@@ -26,7 +26,7 @@
 #ifndef	_SYS_UNIQUE_H
 #define	_SYS_UNIQUE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/zfs_context.h>
 
diff --git a/module/zfs/include/sys/vdev_file.h b/module/zfs/include/sys/vdev_file.h
index cd49673577..b4d40f9df2 100644
--- a/module/zfs/include/sys/vdev_file.h
+++ b/module/zfs/include/sys/vdev_file.h
@@ -27,7 +27,7 @@
 #ifndef _SYS_VDEV_FILE_H
 #define	_SYS_VDEV_FILE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/vdev.h>
 
diff --git a/module/zfs/include/sys/zfs_rlock.h b/module/zfs/include/sys/zfs_rlock.h
index f302b663e2..722c341e23 100644
--- a/module/zfs/include/sys/zfs_rlock.h
+++ b/module/zfs/include/sys/zfs_rlock.h
@@ -26,7 +26,7 @@
 #ifndef	_SYS_FS_ZFS_RLOCK_H
 #define	_SYS_FS_ZFS_RLOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/module/zfs/unique.c b/module/zfs/unique.c
index fbe7b619a2..8c1d2e2f98 100644
--- a/module/zfs/unique.c
+++ b/module/zfs/unique.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 
 #include <sys/zfs_context.h>
 #include <sys/avl.h>