diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index 7112d3ef5..39dca9939 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -122,6 +122,8 @@ extern "C" {
 #include <sys/utsname.h>
 #include <sys/trace_zfs.h>
 
+#include <sys/zfs_delay.h>
+
 #include <sys/zfs_context_os.h>
 
 /*
@@ -588,27 +590,6 @@ typedef struct vsecattr {
 /*
  * Random stuff
  */
-#define	ddi_get_lbolt()		(gethrtime() >> 23)
-#define	ddi_get_lbolt64()	(gethrtime() >> 23)
-#define	hz	119	/* frequency when using gethrtime() >> 23 for lbolt */
-
-#define	ddi_time_before(a, b)		(a < b)
-#define	ddi_time_after(a, b)		ddi_time_before(b, a)
-#define	ddi_time_before_eq(a, b)	(!ddi_time_after(a, b))
-#define	ddi_time_after_eq(a, b)		ddi_time_before_eq(b, a)
-
-#define	ddi_time_before64(a, b)		(a < b)
-#define	ddi_time_after64(a, b)		ddi_time_before64(b, a)
-#define	ddi_time_before_eq64(a, b)	(!ddi_time_after64(a, b))
-#define	ddi_time_after_eq64(a, b)	ddi_time_before_eq64(b, a)
-
-extern void delay(clock_t ticks);
-
-#define	SEC_TO_TICK(sec)	((sec) * hz)
-#define	MSEC_TO_TICK(msec)	(howmany((hrtime_t)(msec) * hz, MILLISEC))
-#define	USEC_TO_TICK(usec)	(howmany((hrtime_t)(usec) * hz, MICROSEC))
-#define	NSEC_TO_TICK(nsec)	(howmany((hrtime_t)(nsec) * hz, NANOSEC))
-
 #define	max_ncpus	64
 #define	boot_ncpus	(sysconf(_SC_NPROCESSORS_ONLN))
 
@@ -758,22 +739,12 @@ void ksiddomain_rele(ksiddomain_t *);
 #define	ddi_log_sysevent(_a, _b, _c, _d, _e, _f, _g) \
 	sysevent_post_event(_c, _d, _b, "libzpool", _e, _f)
 
-#define	zfs_sleep_until(wakeup)						\
-	do {								\
-		hrtime_t delta = wakeup - gethrtime();			\
-		struct timespec ts;					\
-		ts.tv_sec = delta / NANOSEC;				\
-		ts.tv_nsec = delta % NANOSEC;				\
-		(void) nanosleep(&ts, NULL);				\
-	} while (0)
-
 typedef int fstrans_cookie_t;
 
 extern fstrans_cookie_t spl_fstrans_mark(void);
 extern void spl_fstrans_unmark(fstrans_cookie_t);
 extern int kmem_cache_reap_active(void);
 
-
 /*
  * Kernel modules
  */
diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am
index 4eb534d16..98184340e 100644
--- a/lib/libspl/include/Makefile.am
+++ b/lib/libspl/include/Makefile.am
@@ -55,6 +55,7 @@ libspl_sys_HEADERS = \
 	%D%/sys/sunddi.h \
 	%D%/sys/systeminfo.h \
 	%D%/sys/time.h \
+	%D%/sys/timer.h \
 	%D%/sys/trace_spl.h \
 	%D%/sys/tunables.h \
 	%D%/sys/types.h \
diff --git a/lib/libspl/include/sys/timer.h b/lib/libspl/include/sys/timer.h
new file mode 100644
index 000000000..850d11f06
--- /dev/null
+++ b/lib/libspl/include/sys/timer.h
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: CDDL-1.0
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or https://opensource.org/licenses/CDDL-1.0.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * 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 _SPL_TIMER_H
+#define	_SPL_TIMER_H
+
+#include <sys/time.h>
+
+#define	ddi_get_lbolt()		(gethrtime() >> 23)
+#define	ddi_get_lbolt64()	(gethrtime() >> 23)
+#define	hz	119	/* frequency when using gethrtime() >> 23 for lbolt */
+
+#define	ddi_time_before(a, b)		(a < b)
+#define	ddi_time_after(a, b)		ddi_time_before(b, a)
+#define	ddi_time_before_eq(a, b)	(!ddi_time_after(a, b))
+#define	ddi_time_after_eq(a, b)		ddi_time_before_eq(b, a)
+
+#define	ddi_time_before64(a, b)		(a < b)
+#define	ddi_time_after64(a, b)		ddi_time_before64(b, a)
+#define	ddi_time_before_eq64(a, b)	(!ddi_time_after64(a, b))
+#define	ddi_time_after_eq64(a, b)	ddi_time_before_eq64(b, a)
+
+extern void delay(clock_t ticks);
+
+#define	SEC_TO_TICK(sec)	((sec) * hz)
+#define	MSEC_TO_TICK(msec)	(howmany((hrtime_t)(msec) * hz, MILLISEC))
+#define	USEC_TO_TICK(usec)	(howmany((hrtime_t)(usec) * hz, MICROSEC))
+#define	NSEC_TO_TICK(nsec)	(howmany((hrtime_t)(nsec) * hz, NANOSEC))
+
+#define	usleep_range(min, max)						\
+	do {								\
+		struct timespec ts;					\
+		ts.tv_sec = min / MICROSEC;				\
+		ts.tv_nsec = USEC2NSEC(min);				\
+		(void) nanosleep(&ts, NULL);				\
+	} while (0)
+
+#endif  /* _SPL_TIMER_H */