@@ -30,14 +30,14 @@
 #import "OFOutOfRangeException.h"
 
 #import "TableGenerator.h"
 #import "copyright.h"
 
-#define UNICODE_DATA_URL \
-	@"http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"
-#define CASE_FOLDING_URL \
-	@"http://www.unicode.org/Public/UNIDATA/CaseFolding.txt"
+static OFString *const unicodeDataURL =
+    @"http://www.unicode.org/Public/UNIDATA/UnicodeData.txt";
+static OFString *const caseFoldingURL =
+    @"http://www.unicode.org/Public/UNIDATA/CaseFolding.txt";
 
 OF_APPLICATION_DELEGATE(TableGenerator)
 
 @implementation TableGenerator
 - (instancetype)init
@@ -67,11 +67,11 @@
 	OFHTTPRequest *request;
 
 	[OFStdOut writeString: @"Downloading UnicodeData.txt…"];
 	_state = STATE_UNICODE_DATA;
 	request = [OFHTTPRequest requestWithURL:
-	    [OFURL URLWithString: UNICODE_DATA_URL]];
+	    [OFURL URLWithString: unicodeDataURL]];
 	[_HTTPClient asyncPerformRequest: request];
 }
 
 -      (void)client: (OFHTTPClient *)client
   didPerformRequest: (OFHTTPRequest *)request
@@ -167,11 +167,11 @@
 	[OFStdOut writeLine: @" done"];
 
 	[OFStdOut writeString: @"Downloading CaseFolding.txt…"];
 	_state = STATE_CASE_FOLDING;
 	request = [OFHTTPRequest requestWithURL:
-	    [OFURL URLWithString: CASE_FOLDING_URL]];
+	    [OFURL URLWithString: caseFoldingURL]];
 	[_HTTPClient asyncPerformRequest: request];
 }
 
 - (void)parseCaseFolding: (OFHTTPResponse *)response
 {