@@ -12,11 +12,10 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #import "OFStream.h"
-#import "OFHuffmanTree.h"
 #import "OFKernelEventObserver.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 #define OFInflate64StreamBufferSize 4096
@@ -49,23 +48,23 @@
 		} uncompressedHeader;
 		struct {
 			uint16_t position, length;
 		} uncompressed;
 		struct {
-			OFHuffmanTree _Nullable litLenTree;
-			OFHuffmanTree _Nullable distTree;
-			OFHuffmanTree _Nullable codeLenTree;
-			OFHuffmanTree _Nullable treeIter;
+			struct _OFHuffmanTree *_Nullable litLenTree;
+			struct _OFHuffmanTree *_Nullable distTree;
+			struct _OFHuffmanTree *_Nullable codeLenTree;
+			struct _OFHuffmanTree *_Nullable treeIter;
 			uint8_t *_Nullable lengths;
 			uint16_t receivedCount;
 			uint8_t value, litLenCodesCount, distCodesCount;
 			uint8_t codeLenCodesCount;
 		} huffmanTree;
 		struct {
-			OFHuffmanTree _Nullable litLenTree;
-			OFHuffmanTree _Nullable distTree;
-			OFHuffmanTree _Nullable treeIter;
+			struct _OFHuffmanTree *_Nullable litLenTree;
+			struct _OFHuffmanTree *_Nullable distTree;
+			struct _OFHuffmanTree *_Nullable treeIter;
 			int state;
 			uint16_t value, length, distance, extraBits;
 		} huffman;
 	} _context;
 	bool _inLastBlock, _atEndOfStream;