diff --git a/Source/bzip2/blocksort.c b/Source/bzip2/blocksort.c
index f7269681..0281521b 100644
--- a/Source/bzip2/blocksort.c
+++ b/Source/bzip2/blocksort.c
@@ -1,3 +1,5 @@
+#include "../exehead/config.h"
+#if (defined(EXEHEAD) && defined(NSIS_COMPRESS_USE_BZIP2)) || !defined(EXEHEAD)
 /*-------------------------------------------------------------*/
 /*--- Block sorting machinery                               ---*/
 /*---                                           blocksort.c ---*/
@@ -1098,3 +1100,5 @@ void BZ2_blockSort ( EState* s )
 /*-------------------------------------------------------------*/
 /*--- end                                       blocksort.c ---*/
 /*-------------------------------------------------------------*/
+
+#endif
\ No newline at end of file
diff --git a/Source/bzip2/bzlib.c b/Source/bzip2/bzlib.c
index 84a94cb9..8f7ca941 100644
--- a/Source/bzip2/bzlib.c
+++ b/Source/bzip2/bzlib.c
@@ -1,5 +1,5 @@
 #include "../exehead/config.h"
-#if (defined(EXEHEAD) && defined(NSIS_COMPRESS_USE_BZIP2)) || !defined(EXEHEAD)
+#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
 /*-------------------------------------------------------------*/
 /*--- Library top-level functions.                          ---*/
 /*---                                               bzlib.c ---*/
diff --git a/Source/bzip2/compress.c b/Source/bzip2/compress.c
index eba959c8..4019431d 100644
--- a/Source/bzip2/compress.c
+++ b/Source/bzip2/compress.c
@@ -1,3 +1,5 @@
+#include "../exehead/config.h"
+#if !defined(EXEHEAD)
 /*-------------------------------------------------------------*/
 /*--- Compression machinery (not incl block sorting)        ---*/
 /*---                                            compress.c ---*/
@@ -679,3 +681,5 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
 /*-------------------------------------------------------------*/
 /*--- end                                        compress.c ---*/
 /*-------------------------------------------------------------*/
+
+#endif
\ No newline at end of file
diff --git a/Source/bzip2/decompress.c b/Source/bzip2/decompress.c
index 4cbc23e8..62af43aa 100644
--- a/Source/bzip2/decompress.c
+++ b/Source/bzip2/decompress.c
@@ -1,5 +1,5 @@
 #include "../exehead/config.h"
-#ifdef NSIS_COMPRESS_USE_BZIP2
+#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
 
 /*-------------------------------------------------------------*/
 /*--- Decompression machinery                               ---*/
diff --git a/Source/bzip2/huffman.c b/Source/bzip2/huffman.c
index 4a8b37fa..f6f381e6 100644
--- a/Source/bzip2/huffman.c
+++ b/Source/bzip2/huffman.c
@@ -1,3 +1,5 @@
+#include "../exehead/config.h"
+#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
 /*-------------------------------------------------------------*/
 /*--- Huffman coding low-level stuff                        ---*/
 /*---                                             huffman.c ---*/
@@ -226,4 +228,5 @@ void BZ2_hbCreateDecodeTables ( Int32 *limit,
 
 /*-------------------------------------------------------------*/
 /*--- end                                         huffman.c ---*/
-/*-------------------------------------------------------------*/
\ No newline at end of file
+/*-------------------------------------------------------------*/
+#endif
\ No newline at end of file
diff --git a/Source/bzip2/randtable.c b/Source/bzip2/randtable.c
index 99969350..f8073cb9 100644
--- a/Source/bzip2/randtable.c
+++ b/Source/bzip2/randtable.c
@@ -1,5 +1,5 @@
 #include "../exehead/config.h"
-#ifdef NSIS_COMPRESS_USE_BZIP2
+#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
 
 /*-------------------------------------------------------------*/
 /*--- Table for randomising repetitive blocks               ---*/