diff --git a/js.h b/js.h
index d37616a..39ded99 100644
--- a/js.h
+++ b/js.h
@@ -1,7 +1,28 @@
 #ifndef js_h
 #define js_h
 
-#include "jsconf.h"
+/* noreturn is a GCC extension */
+#ifdef __GNUC__
+#define JS_NORETURN __attribute__((noreturn))
+#else
+#ifdef _MSC_VER
+#define JS_NORETURN __declspec(noreturn)
+#else
+#define JS_NORETURN
+#endif
+#endif
+
+/* GCC can do type checking of printf strings */
+#ifdef __printflike
+#define JS_PRINTFLIKE __printflike
+#else
+#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+#define JS_PRINTFLIKE(fmtarg, firstvararg) \
+	__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
+#else
+#define JS_PRINTFLIKE(fmtarg, firstvararg)
+#endif
+#endif
 
 typedef struct js_State js_State;
 
diff --git a/jsconf.h b/jsconf.h
deleted file mode 100644
index 89c17c6..0000000
--- a/jsconf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef js_conf_h
-#define js_conf_h
-
-#define JS_STACKSIZE 256	/* value stack size */
-#define JS_MINSTACK 20		/* at least this much available when entering a function */
-#define JS_TRYLIMIT 64		/* exception stack size */
-#define JS_GCLIMIT 10000	/* run gc cycle every N allocations */
-
-/* noreturn is a GCC extension */
-#ifdef __GNUC__
-#define JS_NORETURN __attribute__((noreturn))
-#else
-#ifdef _MSC_VER
-#define JS_NORETURN __declspec(noreturn)
-#else
-#define JS_NORETURN
-#endif
-#endif
-
-/* GCC can do type checking of printf strings */
-#ifdef __printflike
-#define JS_PRINTFLIKE __printflike
-#else
-#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-#define JS_PRINTFLIKE(fmtarg, firstvararg) \
-	__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#else
-#define JS_PRINTFLIKE(fmtarg, firstvararg)
-#endif
-#endif
-
-#endif
diff --git a/jsi.h b/jsi.h
index 853efe9..2870d2d 100644
--- a/jsi.h
+++ b/jsi.h
@@ -20,6 +20,13 @@ typedef struct js_Environment js_Environment;
 typedef struct js_StringNode js_StringNode;
 typedef struct js_Jumpbuf js_Jumpbuf;
 
+/* Limits */
+
+#define JS_STACKSIZE 256	/* value stack size */
+#define JS_MINSTACK 20		/* at least this much available when entering a function */
+#define JS_TRYLIMIT 64		/* exception stack size */
+#define JS_GCLIMIT 10000	/* run gc cycle every N allocations */
+
 /* String interning */
 
 const char *js_intern(js_State *J, const char *s);