@@ -114,11 +114,11 @@
 #import "OFXMLElement.h"
 #import "OFXMLAttribute.h"
 #import "OFXMLCharacters.h"
 #import "OFXMLCDATA.h"
 #import "OFXMLComment.h"
-#import "OFXMLProcessingInstructions.h"
+#import "OFXMLProcessingInstruction.h"
 #import "OFXMLParser.h"
 #import "OFXMLElementBuilder.h"
 
 #import "OFMessagePackExtension.h"
 
@@ -126,11 +126,10 @@
 #import "OFSystemInfo.h"
 #import "OFLocale.h"
 #import "OFOptionsParser.h"
 #import "OFTimer.h"
 #import "OFRunLoop.h"
-#import "OFSandbox.h"
 
 #ifdef OF_WINDOWS
 # import "OFWindowsRegistryKey.h"
 #endif
 
@@ -222,11 +221,10 @@
 #import "OFRemoveItemFailedException.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFResolveHostFailedException.h"
 #endif
 #import "OFRetrieveItemAttributesFailedException.h"
-#import "OFSandboxActivationFailedException.h"
 #import "OFSeekFailedException.h"
 #import "OFSetItemAttributesFailedException.h"
 #import "OFSetOptionFailedException.h"
 #ifdef OF_WINDOWS
 # import "OFSetWindowsRegistryValueFailedException.h"
@@ -250,33 +248,29 @@
 #ifdef OF_HAVE_PLUGINS
 # import "OFPlugin.h"
 #endif
 
 #ifdef OF_HAVE_ATOMIC_OPS
-# import "atomic.h"
-#endif
-
-#import "OFLocking.h"
-#import "OFThread.h"
-#import "once.h"
-#ifdef OF_HAVE_THREADS
-# import "thread.h"
-# import "tlskey.h"
-# import "mutex.h"
-# import "condition.h"
-# import "OFThreadPool.h"
-# import "OFMutex.h"
-# import "OFRecursiveMutex.h"
-# import "OFCondition.h"
-#endif
-
-#import "base64.h"
-#import "crc16.h"
-#import "crc32.h"
-#import "huffman_tree.h"
-#import "of_asprintf.h"
-#import "of_strptime.h"
-#import "pbkdf2.h"
-#import "scrypt.h"
-#ifdef OF_HAVE_UNICODE_TABLES
-# import "unicode.h"
-#endif
+# import "OFAtomic.h"
+#endif
+#import "OFLocking.h"
+#import "OFOnce.h"
+#import "OFThread.h"
+#ifdef OF_HAVE_THREADS
+# import "OFCondition.h"
+# import "OFMutex.h"
+# import "OFPlainCondition.h"
+# import "OFPlainMutex.h"
+# import "OFPlainThread.h"
+# import "OFRecursiveMutex.h"
+# import "OFTLSKey.h"
+# import "OFThreadPool.h"
+#endif
+
+#import "OFASPrintF.h"
+#import "OFBase64.h"
+#import "OFCRC16.h"
+#import "OFCRC32.h"
+#import "OFHuffmanTree.h"
+#import "OFPBKDF2.h"
+#import "OFScrypt.h"
+#import "OFStrPTime.h"