diff --git a/intern/ffmpeg/tests/ffmpeg_codecs.cc b/intern/ffmpeg/tests/ffmpeg_codecs.cc
index d3cba6d228a..9538bac84d2 100644
--- a/intern/ffmpeg/tests/ffmpeg_codecs.cc
+++ b/intern/ffmpeg/tests/ffmpeg_codecs.cc
@@ -5,6 +5,8 @@ extern "C" {
 #include <libavutil/log.h>
 }
 
+namespace {
+
 bool test_vcodec(AVCodec *codec, AVPixelFormat pixelformat)
 {
   av_log_set_level(AV_LOG_QUIET);
@@ -108,6 +110,8 @@ bool test_codec_audio_by_name(const char *codecname, AVSampleFormat fmt)
     EXPECT_TRUE(test_codec_audio_by_name(str(codec), fmt)); \
   }
 
+}  // namespace
+
 /* generic codec ID's used in blender */
 
 FFMPEG_TEST_VCODEC_ID(AV_CODEC_ID_HUFFYUV, AV_PIX_FMT_BGRA)
diff --git a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc
index a5949c58037..624a296e758 100644
--- a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc
+++ b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc
@@ -56,7 +56,7 @@ static void test_valid_polyfill_prepare(unsigned int tris[][3], unsigned int tri
  * - all tris set.
  * - all verts used at least once.
  */
-static void test_polyfill_simple(const float poly[][2],
+static void test_polyfill_simple(const float /*poly*/[][2],
                                  const unsigned int poly_tot,
                                  const unsigned int tris[][3],
                                  const unsigned int tris_tot)
@@ -79,7 +79,7 @@ static void test_polyfill_simple(const float poly[][2],
   MEM_freeN(tot_used);
 }
 
-static void test_polyfill_topology(const float poly[][2],
+static void test_polyfill_topology(const float /*poly*/[][2],
                                    const unsigned int poly_tot,
                                    const unsigned int tris[][3],
                                    const unsigned int tris_tot)
@@ -125,7 +125,7 @@ static void test_polyfill_topology(const float poly[][2],
  * Check all faces are flipped the same way
  */
 static void test_polyfill_winding(const float poly[][2],
-                                  const unsigned int poly_tot,
+                                  const unsigned int /*poly_tot*/,
                                   const unsigned int tris[][3],
                                   const unsigned int tris_tot)
 {
diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt
index c7cb65f78b2..88fbed0a49b 100644
--- a/source/blender/blenlib/tests/performance/CMakeLists.txt
+++ b/source/blender/blenlib/tests/performance/CMakeLists.txt
@@ -21,10 +21,6 @@
 set(INC
   .
   ..
-  ../../../source/blender/blenlib
-  ../../../source/blender/makesdna
-  ../../../intern/guardedalloc
-  ../../../intern/atomic
 )
 
 setup_libdirs()
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 62720d8ca37..c8b8d82e82b 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -990,7 +990,7 @@ void ED_screen_global_areas_refresh(wmWindow *win)
  * \warning The returned screen may not always equal \a screen_new!
  */
 void screen_change_prepare(
-    bScreen *screen_old, bScreen *screen_new, Main *bmain, bContext *C, wmWindow *win)
+    bScreen *screen_old, bScreen *screen_new, Main *UNUSED(bmain), bContext *C, wmWindow *win)
 {
   BLI_assert(BLI_findindex(&bmain->screens, screen_new) != -1);