diff --git a/zlibWrapper/.gitignore b/zlibWrapper/.gitignore
index 56473513b..bf3f3d87d 100644
--- a/zlibWrapper/.gitignore
+++ b/zlibWrapper/.gitignore
@@ -19,6 +19,9 @@
 
 # Default result files
 _*
+example
+example_zstd
+foo.gz
 
 # Misc files
 *.bat
diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index 6bd820452..c2efe380e 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -29,13 +29,13 @@
     - zstd source repository : https://github.com/Cyan4973/zstd
 */
 
-#include <stdarg.h>            /* va_list */
+#include <stdarg.h>            /* va_list, for z_gzprintf */
 #include <zlib.h>
 #include "zstd_zlibwrapper.h"
+#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_MAGICNUMBER */
 #include "zstd.h"
-#include "zstd_static.h"       /* ZSTD_MAGICNUMBER */
+#define ZBUFF_STATIC_LINKING_ONLY  /* ZBUFF_createCCtx_advanced */
 #include "zbuff.h"
-#include "zbuff_static.h"      /* ZBUFF_createCCtx_advanced */
 #include "zstd_internal.h"     /* defaultCustomMem */