diff --git a/umem.c b/umem.c
index 5bf1fa1..c0657bd 100644
--- a/umem.c
+++ b/umem.c
@@ -3058,12 +3058,7 @@ umem_cache_init(void)
  * umem_startup() is called early on, and must be called explicitly if we're
  * the standalone version.
  */
-#ifdef UMEM_STANDALONE
 void
-#else
-/* #pragma init(umem_startup) */
-static void
-#endif
 umem_startup(caddr_t start, size_t len, size_t pagesize, caddr_t minstack,
         caddr_t maxstack)
 {
diff --git a/umem_impl.h b/umem_impl.h
index 15359aa..bde89ce 100644
--- a/umem_impl.h
+++ b/umem_impl.h
@@ -375,7 +375,7 @@ typedef struct umem_cpu {
 	uint32_t cpu_number;
 } umem_cpu_t;
 
-#define	UMEM_MAXBUF	16384 /* Solaris/SmartOS defines this as 131072 */
+#define	UMEM_MAXBUF	131072
 
 #define	UMEM_ALIGN		8	/* min guaranteed alignment */
 #define	UMEM_ALIGN_SHIFT	3	/* log2(UMEM_ALIGN) */