diff --git a/configure b/configure
index 4dcb27b423..2282cfb18e 100755
--- a/configure
+++ b/configure
@@ -2728,6 +2728,7 @@ sdp_demuxer_select="rtpdec"
 smoothstreaming_muxer_select="ismv_muxer"
 spdif_muxer_select="aac_parser"
 spx_muxer_select="ogg_muxer"
+swf_demuxer_suggest="zlib"
 tak_demuxer_select="tak_parser"
 tg2_muxer_select="mov_muxer"
 tgp_muxer_select="mov_muxer"
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 93a094c26d..ab67c756f4 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -134,8 +134,8 @@ typedef struct SWFContext {
     AVCodecContext *audio_enc, *video_enc;
     AVStream *video_st;
 #if CONFIG_ZLIB
-    AVIOContext *zpb;
 #define ZBUF_SIZE 4096
+    AVIOContext *zpb;
     uint8_t *zbuf_in;
     uint8_t *zbuf_out;
     z_stream zstream;
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index e596ffaa92..eb17e82e08 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -20,6 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/imgutils.h"