diff --git a/Makefile b/Makefile
index cea6cb60c..7caaa4661 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 # ################################################################
 
 # Version number
-export VERSION := 0.3.6
+export VERSION := 0.4.0
 
 PRGDIR  = programs
 ZSTDDIR = lib
diff --git a/NEWS b/NEWS
index 0b635d803..94bd7db19 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v0.4.0
+Removed zstdhc => merged into zstd
+
 v0.3.6
 small blocks params
 
diff --git a/lib/Makefile b/lib/Makefile
index 7d09111a7..f027076f0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -67,10 +67,10 @@ default: libzstd
 
 all: libzstd
 
-libzstd: zstd.c huff0.c fse.c
+libzstd: zstd_compress.c zstd_decompress.c huff0.c fse.c
 	@echo compiling static library
 	@$(CC) $(FLAGS) -c $^
-	@$(AR) rcs libzstd.a zstd.o huff0.o fse.o
+	@$(AR) rcs libzstd.a zstd_compress.o zstd_decompress.o huff0.o fse.o
 	@echo compiling dynamic library $(LIBVER)
 	@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
 	@echo creating versioned links
diff --git a/lib/zstd.h b/lib/zstd.h
index 3b18a867d..96bb184f0 100644
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@ -47,8 +47,8 @@ extern "C" {
 *  Version
 ***************************************/
 #define ZSTD_VERSION_MAJOR    0    /* for breaking interface changes  */
-#define ZSTD_VERSION_MINOR    3    /* for new (non-breaking) interface capabilities */
-#define ZSTD_VERSION_RELEASE  6    /* for tweaks, bug-fixes, or development */
+#define ZSTD_VERSION_MINOR    4    /* for new (non-breaking) interface capabilities */
+#define ZSTD_VERSION_RELEASE  0    /* for tweaks, bug-fixes, or development */
 #define ZSTD_VERSION_NUMBER  (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE)
 unsigned ZSTD_versionNumber (void);
 
diff --git a/lib/zstd_decompress.c b/lib/zstd_decompress.c
index f3edeb6f2..36d5bfc38 100644
--- a/lib/zstd_decompress.c
+++ b/lib/zstd_decompress.c
@@ -123,10 +123,6 @@
 #define IS_RAW BIT0
 #define IS_RLE BIT1
 
-static const U32 g_maxDistance = 4 * BLOCKSIZE;
-static const U32 g_maxLimit = 1 GB;
-
-#define WORKPLACESIZE (BLOCKSIZE*3)
 #define MINMATCH 4
 #define LitFSELog  11
 #define MLFSELog   10
diff --git a/programs/bench.h b/programs/bench.h
index 08f8a3639..3cc67b4df 100644
--- a/programs/bench.h
+++ b/programs/bench.h
@@ -26,7 +26,7 @@
 
 
 /* Main function */
-int BMK_benchFiles(char** fileNamesTable, unsigned nbFiles, unsigned cLevel);
+int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, unsigned cLevel);
 
 /* Set Parameters */
 void BMK_SetNbIterations(int nbLoops);
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 65b235500..5b74df62c 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -163,7 +163,7 @@ static void waitEnter(void)
 }
 
 
-int main(int argc, char** argv)
+int main(int argCount, const char** argv)
 {
     int i,
         bench=0,
@@ -196,9 +196,9 @@ int main(int argc, char** argv)
         decode=1;
 
     /* command switches */
-    for(i=1; i<argc; i++)
+    for(i=1; i<argCount; i++)
     {
-        char* argument = argv[i];
+        const char* argument = argv[i];
 
         if(!argument) continue;   /* Protection if argument empty */
 
@@ -311,7 +311,7 @@ int main(int argc, char** argv)
         }
 
         /* first provided filename is input */
-        if (!inFileName) { inFileName = argument; fileNameStart = i; nbFiles = argc-i; continue; }
+        if (!inFileName) { inFileName = argument; fileNameStart = i; nbFiles = argCount-i; continue; }
 
         /* second provided filename is output */
         if (!outFileName)