diff --git a/include/spl-callb.h b/include/spl-callb.h
index 4480b4202..98b966778 100644
--- a/include/spl-callb.h
+++ b/include/spl-callb.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_CALLB_H
-#define _SOLARIS_CALLB_H
+#ifndef _SPL_CALLB_H
+#define _SPL_CALLB_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -42,5 +42,5 @@ typedef struct callb_cpr {
 }
 #endif
 
-#endif  /* _SOLARIS_CALLB_H */
+#endif  /* _SPL_CALLB_H */
 
diff --git a/include/spl-condvar.h b/include/spl-condvar.h
index 8f5cb922a..6a2060fd2 100644
--- a/include/spl-condvar.h
+++ b/include/spl-condvar.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_CONDVAR_H
-#define _SOLARIS_CONDVAR_H
+#ifndef _SPL_CONDVAR_H
+#define _SPL_CONDVAR_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -199,4 +199,4 @@ cv_broadcast(kcondvar_t *cvp)
 	if (atomic_read(&cvp->cv_waiters) > 0)
 		wake_up_all(&cvp->cv_event);
 }
-#endif /* _SOLARIS_CONDVAR_H */
+#endif /* _SPL_CONDVAR_H */
diff --git a/include/spl-cred.h b/include/spl-cred.h
index 946810d5e..0935a19fa 100644
--- a/include/spl-cred.h
+++ b/include/spl-cred.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_CRED_H
-#define _SOLARIS_CRED_H
+#ifndef _SPL_CRED_H
+#define _SPL_CRED_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -37,5 +37,5 @@ typedef struct cred {
 }
 #endif
 
-#endif  /* _SOLARIS_CRED_H */
+#endif  /* _SPL_CRED_H */
 
diff --git a/include/spl-generic.h b/include/spl-generic.h
index ee77cba57..2d0989233 100644
--- a/include/spl-generic.h
+++ b/include/spl-generic.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_GENERIC_H
-#define _SOLARIS_GENERIC_H
+#ifndef _SPL_GENERIC_H
+#define _SPL_GENERIC_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -71,4 +71,4 @@ extern int p0;
 }
 #endif
 
-#endif  /* _SOLARIS_GENERIC_H */
+#endif  /* _SPL_GENERIC_H */
diff --git a/include/spl-kmem.h b/include/spl-kmem.h
index 3025e1a97..89367c069 100644
--- a/include/spl-kmem.h
+++ b/include/spl-kmem.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_KMEM_H
-#define	_SOLARIS_KMEM_H
+#ifndef _SPL_KMEM_H
+#define	_SPL_KMEM_H
 
 #ifdef	__cplusplus
 extern "C" {
@@ -173,4 +173,4 @@ extern __kmem_reap(void);
 }
 #endif
 
-#endif	/* _SOLARIS_KMEM_H */
+#endif	/* _SPL_KMEM_H */
diff --git a/include/spl-kstat.h b/include/spl-kstat.h
index 5fc95ccaa..cbef067d5 100644
--- a/include/spl-kstat.h
+++ b/include/spl-kstat.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_KSTAT_H
-#define _SOLARIS_KSTAT_H
+#ifndef _SPL_KSTAT_H
+#define _SPL_KSTAT_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -111,7 +111,7 @@ typedef struct kstat_named_s {
 
 
 static __inline__ kstat_t *
-kstat_create(const char *ks_module, int ks_instance, const char *ks_name, 
+kstat_create(const char *ks_module, int ks_instance, const char *ks_name,
              const char *ks_class, uchar_t ks_type, uint_t ks_ndata,
              uchar_t ks_flags)
 {
@@ -134,5 +134,5 @@ kstat_delete(kstat_t *ksp)
 }
 #endif
 
-#endif  /* _SOLARIS_KSTAT_H */
+#endif  /* _SPL_KSTAT_H */
 
diff --git a/include/spl-mutex.h b/include/spl-mutex.h
index a937a1de2..dec5dd7de 100644
--- a/include/spl-mutex.h
+++ b/include/spl-mutex.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_MUTEX_H
-#define	_SOLARIS_MUTEX_H
+#ifndef _SPL_MUTEX_H
+#define	_SPL_MUTEX_H
 
 #ifdef	__cplusplus
 extern "C" {
@@ -118,4 +118,4 @@ mutex_owner(kmutex_t *mp)
 }
 #endif
 
-#endif	/* _SOLARIS_MUTEX_H */
+#endif	/* _SPL_MUTEX_H */
diff --git a/include/spl-random.h b/include/spl-random.h
index 68ca8dde7..b7f83ce1a 100644
--- a/include/spl-random.h
+++ b/include/spl-random.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_RANDOM_H
-#define	_SOLARIS_RANDOM_H
+#ifndef _SPL_RANDOM_H
+#define	_SPL_RANDOM_H
 
 #ifdef	__cplusplus
 extern "C" {
@@ -35,4 +35,4 @@ random_get_pseudo_bytes(uint8_t *ptr, size_t len)
 }
 #endif
 
-#endif	/* _SOLARIS_RANDOM_H */
+#endif	/* _SPL_RANDOM_H */
diff --git a/include/spl-rwlock.h b/include/spl-rwlock.h
index 305ccdf2b..b04a4f0db 100644
--- a/include/spl-rwlock.h
+++ b/include/spl-rwlock.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_RWLOCK_H
-#define	_SOLARIS_RWLOCK_H
+#ifndef _SPL_RWLOCK_H
+#define	_SPL_RWLOCK_H
 
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -221,4 +221,4 @@ rw_owner(krwlock_t *rwlp)
 }
 #endif
 
-#endif	/* _SOLARIS_RWLOCK_H */
+#endif	/* _SPL_RWLOCK_H */
diff --git a/include/spl-taskq.h b/include/spl-taskq.h
index bf6e24438..3723a6d47 100644
--- a/include/spl-taskq.h
+++ b/include/spl-taskq.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_TASKQ_H
-#define _SOLARIS_TASKQ_H
+#ifndef _SPL_TASKQ_H
+#define _SPL_TASKQ_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -84,4 +84,4 @@ extern taskq_t *__taskq_create(const char *, int, pri_t, int, int, uint_t);
 }
 #endif
 
-#endif  /* _SOLARIS_TASKQ_H */
+#endif  /* _SPL_TASKQ_H */
diff --git a/include/spl-thread.h b/include/spl-thread.h
index 567d397e1..8833846e9 100644
--- a/include/spl-thread.h
+++ b/include/spl-thread.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_THREAD_H
-#define _SOLARIS_THREAD_H
+#ifndef _SPL_THREAD_H
+#define _SPL_THREAD_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -46,5 +46,5 @@ extern void __thread_exit(void);
 }
 #endif
 
-#endif  /* _SOLARIS_THREAD_H */
+#endif  /* _SPL_THREAD_H */
 
diff --git a/include/spl-time.h b/include/spl-time.h
index 8fe1e59aa..576fd191c 100644
--- a/include/spl-time.h
+++ b/include/spl-time.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_TIME_H
-#define _SOLARIS_TIME_H
+#ifndef _SPL_TIME_H
+#define _SPL_TIME_H
 
 /*
  * Structure returned by gettimeofday(2) system call,
@@ -60,4 +60,4 @@ gethrestime_sec(void)
 }
 #endif
 
-#endif  /* _SOLARIS_TIME_H */
+#endif  /* _SPL_TIME_H */
diff --git a/include/spl-timer.h b/include/spl-timer.h
index faee64755..237195d76 100644
--- a/include/spl-timer.h
+++ b/include/spl-timer.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_TIMER_H
-#define _SOLARIS_TIMER_H
+#ifndef _SPL_TIMER_H
+#define _SPL_TIMER_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -18,5 +18,5 @@ extern "C" {
 }
 #endif
 
-#endif  /* _SOLARIS_TIMER_H */
+#endif  /* _SPL_TIMER_H */
 
diff --git a/include/spl-types.h b/include/spl-types.h
index d61b2f21f..b72b6c9e0 100644
--- a/include/spl-types.h
+++ b/include/spl-types.h
@@ -1,5 +1,5 @@
-#ifndef _SOLARIS_TYPES_H
-#define	_SOLARIS_TYPES_H
+#ifndef _SPL_TYPES_H
+#define	_SPL_TYPES_H
 
 #ifdef	__cplusplus
 extern "C" {
@@ -24,4 +24,4 @@ typedef short				pri_t;
 }
 #endif
 
-#endif	/* _SOLARIS_TYPES_H */
+#endif	/* _SPL_TYPES_H */