-#ifndef CYCRIPT_H
-#define CYCRIPT_H
+#ifndef CYCRIPT_HPP
+#define CYCRIPT_HPP
#ifdef __OBJC__
#include <Foundation/Foundation.h>
#endif
-#include <JavaScriptCore/JSBase.h>
-#include <JavaScriptCore/JSValueRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSStringRef.h>
+#include <JavaScriptCore/JavaScript.h>
#include <JavaScriptCore/JSStringRefCF.h>
-JSContextRef CYGetJSContext();
-CFStringRef CYCopyJSONString(JSContextRef context, JSValueRef value);
+#include <apr-1/apr_pools.h>
-#ifdef __OBJC__
-void CYThrow(JSContextRef context, id error, JSValueRef *exception);
-#endif
+JSGlobalContextRef CYGetJSContext();
+const char *CYPoolJSONString(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
+void CYSetArgs(int argc, const char *argv[]);
-#endif/*CYCRIPT_H*/
+#endif/*CYCRIPT_HPP*/