diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index d010b4eb3..7c410dc23 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -133,14 +133,6 @@ extern "C" {
 
 #include <sys/zfs_context_os.h>
 
-/*
- * Stack
- */
-
-#define	noinline	__attribute__((noinline))
-#define	likely(x)	__builtin_expect((x), 1)
-#define	unlikely(x)	__builtin_expect((x), 0)
-
 #ifdef __FreeBSD__
 typedef off_t loff_t;
 #endif
diff --git a/lib/libspl/include/sys/debug.h b/lib/libspl/include/sys/debug.h
index 02f33a68b..6ce8c88f6 100644
--- a/lib/libspl/include/sys/debug.h
+++ b/lib/libspl/include/sys/debug.h
@@ -24,6 +24,12 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012, 2018 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ */
 
 #ifndef _LIBSPL_SYS_DEBUG_H
 #define	_LIBSPL_SYS_DEBUG_H
@@ -42,4 +48,16 @@
 #define	__must_check __attribute__((warn_unused_result))
 #endif
 
+#ifndef noinline
+#define	noinline	__attribute__((noinline))
+#endif
+
+#ifndef likely
+#define	likely(x)	__builtin_expect((x), 1)
+#endif
+
+#ifndef unlikely
+#define	unlikely(x)	__builtin_expect((x), 0)
+#endif
+
 #endif