diff --git a/include/sys/attr.h b/include/sys/attr.h
new file mode 100644
index 0000000000..47469ced6e
--- /dev/null
+++ b/include/sys/attr.h
@@ -0,0 +1,4 @@
+#ifndef _SPL_ATTR_H
+#define _SPL_ATTR_H
+
+#endif /* SPL_ATTR_H */
diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index 08d0e19711..ababed0fd0 100644
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -39,6 +39,7 @@ extern "C" {
 #define DEV_BSHIFT			9 /* log2(DEV_BSIZE) */
 
 #define max_ncpus                       64
+#define CPU_SEQID			smp_processor_id() /* I think... */
 #define _NOTE(x)
 
 /* 0..MAX_PRIO-1:		Process priority
diff --git a/include/sys/systeminfo.h b/include/sys/systeminfo.h
new file mode 100644
index 0000000000..e297f2a5a3
--- /dev/null
+++ b/include/sys/systeminfo.h
@@ -0,0 +1,4 @@
+#ifndef _SPL_SYSTEMINFO_H
+#define _SPL_SYSTEMINFO_H
+
+#endif /* SPL_SYSTEMINFO_H */
diff --git a/include/sys/thread.h b/include/sys/thread.h
index 4532aee5bb..44e2902a65 100644
--- a/include/sys/thread.h
+++ b/include/sys/thread.h
@@ -27,12 +27,13 @@ extern "C" {
 #endif
 
 #define thread_create(stk, stksize, func, arg, len, pp, state, pri)      \
-	__thread_create(stk, stksize, func, arg, len, pp, state, pri)
+	__thread_create(stk, stksize, (void (*)(void *))func,            \
+		        arg, len, pp, state, pri)
 #define thread_exit()			__thread_exit()
 #define curthread			get_current()
 
 extern kthread_t *__thread_create(caddr_t stk, size_t  stksize,
-                            void (*proc)(void *), void *args,
+                            void (*func)(void *), void *args,
                             size_t len, int *pp, int state,
                             pri_t pri);
 extern void __thread_exit(void);