@@ -91,12 +91,13 @@
 	      maxLength: (size_t)maxLength
 	       encoding: (OFStringEncoding)encoding
 		  lossy: (bool)lossy OF_DIRECT;
 - (const char *)of_cStringWithEncoding: (OFStringEncoding)encoding
 				 lossy: (bool)lossy OF_DIRECT;
-- (OFString *)of_JSONRepresentationWithOptions: (int)options
-					 depth: (size_t)depth;
+- (OFString *)
+    of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
+			       depth: (size_t)depth;
 @end
 
 @interface OFStringPlaceholder: OFString
 @end
 
@@ -1709,17 +1710,19 @@
 - (OFString *)JSONRepresentation
 {
 	return [self of_JSONRepresentationWithOptions: 0 depth: 0];
 }
 
-- (OFString *)JSONRepresentationWithOptions: (int)options
+- (OFString *)JSONRepresentationWithOptions:
+    (OFJSONRepresentationOptions)options
 {
 	return [self of_JSONRepresentationWithOptions: options depth: 0];
 }
 
-- (OFString *)of_JSONRepresentationWithOptions: (int)options
-					 depth: (size_t)depth
+- (OFString *)
+    of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
+			       depth: (size_t)depth
 {
 	OFMutableString *JSON = [[self mutableCopy] autorelease];
 
 	/* FIXME: This is slow! Write it in pure C! */
 	[JSON replaceOccurrencesOfString: @"\\" withString: @"\\\\"];
@@ -1727,14 +1730,14 @@
 	[JSON replaceOccurrencesOfString: @"\b" withString: @"\\b"];
 	[JSON replaceOccurrencesOfString: @"\f" withString: @"\\f"];
 	[JSON replaceOccurrencesOfString: @"\r" withString: @"\\r"];
 	[JSON replaceOccurrencesOfString: @"\t" withString: @"\\t"];
 
-	if (options & OF_JSON_REPRESENTATION_JSON5) {
+	if (options & OFJSONRepresentationOptionJSON5) {
 		[JSON replaceOccurrencesOfString: @"\n" withString: @"\\\n"];
 
-		if (options & OF_JSON_REPRESENTATION_IDENTIFIER) {
+		if (options & OFJSONRepresentationOptionIsIdentifier) {
 			const char *cString = self.UTF8String;
 
 			if ((!of_ascii_isalpha(cString[0]) &&
 			    cString[0] != '_' && cString[0] != '$') ||
 			    strpbrk(cString, " \n\r\t\b\f\\\"'") != NULL) {