@@ -368,9 +368,9 @@
 - (uintmax_t)hexadecimalValueAsInteger;
 @end
 
 #import "OFConstString.h"
 #import "OFMutableString.h"
-#import "OFHash.h"
-#import "OFURLEncoding.h"
-#import "OFXMLElement.h"
-#import "OFXMLParser.h"
+#import "OFString+Hashing.h"
+#import "OFString+URLEncoding.h"
+#import "OFString+XMLEscaping.h"
+#import "OFString+XMLUnescaping.h"