diff --git a/3rdparty/stb_image/stb_image.c b/3rdparty/stb_image/stb_image.c
index 8bd036654..c40f8e1ed 100644
--- a/3rdparty/stb_image/stb_image.c
+++ b/3rdparty/stb_image/stb_image.c
@@ -1729,11 +1729,10 @@ static uint8 *resample_row_hv_2(uint8 *out, uint8 *in_near, uint8 *in_far, int w
    return out;
 }
 
-static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 *in_far, int w, int hs)
+static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 * /*in_far*/, int w, int hs)
 {
    // resample with nearest-neighbor
    int i,j;
-   in_far = in_far;
    for (i=0; i < w; ++i)
       for (j=0; j < hs; ++j)
          out[i*hs+j] = in_near[i];
diff --git a/makefile b/makefile
index 23ed44bea..3bb471ff3 100644
--- a/makefile
+++ b/makefile
@@ -108,6 +108,10 @@ qnx-arm: qnx-arm-debug qnx-arm-release
 rebuild-shaders:
 	make -R -C examples rebuild
 
+analyze:
+	cppcheck src/
+	cppcheck examples/
+
 docs:
 	doxygen premake/bgfx.doxygen
 	markdown README.md > .build/docs/readme.html
diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp
index dea754056..956d08769 100644
--- a/tools/shaderc/shaderc.cpp
+++ b/tools/shaderc/shaderc.cpp
@@ -3,6 +3,8 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
+#include <bx/bx.h>
+
 #ifndef SHADERC_DEBUG
 #	define SHADERC_DEBUG 0
 #endif // SHADERC_DEBUG
@@ -31,8 +33,6 @@ extern "C"
 #define BGFX_CHUNK_MAGIC_VSH BX_MAKEFOURCC('V', 'S', 'H', 0x1)
 #define BGFX_CHUNK_MAGIC_FSH BX_MAKEFOURCC('F', 'S', 'H', 0x1)
 
-#include <bx/bx.h>
-
 #include <bx/commandline.h>
 #include <bx/endian.h>
 #include <bx/uint32_t.h>