@@ -13,12 +13,10 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#define OF_INFLATE_STREAM_M
-
 #include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 
@@ -104,10 +102,11 @@
 static const uint8_t codeLengthsOrder[19] = {
 	16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
 };
 static struct of_huffman_tree *fixedLitLenTree, *fixedDistTree;
 
+@implementation OFInflateStream
 static OF_INLINE bool
 tryReadBits(OFInflateStream *stream, uint16_t *bits, uint8_t count)
 {
 	uint16_t ret = stream->_savedBits;
 
@@ -146,11 +145,10 @@
 	*bits = ret;
 
 	return true;
 }
 
-@implementation OFInflateStream
 + (void)initialize
 {
 	uint8_t lengths[288];
 
 	if (self != [OFInflateStream class])