diff --git a/intern/eigen/intern/matrix.cc b/intern/eigen/intern/matrix.cc
index fef212ac04d1e942eca58fb4274b72b5e53460b6..2a4bc0e6bd2b87aa9974fc93c92f9f19e659fab2 100644
--- a/intern/eigen/intern/matrix.cc
+++ b/intern/eigen/intern/matrix.cc
@@ -14,7 +14,8 @@
 #  pragma GCC diagnostic ignored "-Wlogical-op"
 #endif
 
-#ifdef __EIGEN3_MATRIX_C_API_CC__ /* quiet warning */
+#ifdef __EIGEN3_MATRIX_C_API_CC__
+/* Quiet warning. */
 #endif
 
 #include <Eigen/Core>
diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc
index 0bccab7ce3ea38cc7a95c2dcfae0c54a0335b23c..6d4bb50cc357e56b459f8ee7c16cf50b6699dbf0 100644
--- a/intern/eigen/intern/svd.cc
+++ b/intern/eigen/intern/svd.cc
@@ -14,7 +14,8 @@
 #  pragma GCC diagnostic ignored "-Wlogical-op"
 #endif
 
-#ifdef __EIGEN3_SVD_C_API_CC__ /* quiet warning */
+#ifdef __EIGEN3_SVD_C_API_CC__
+/* Quiet warning. */
 #endif
 
 #include <Eigen/Core>
diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index b5d7ec3b8181b2164b9477658318caa131781ec7..dbfbde97c2f759dcddb1d45950383b180eeb744e 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -323,7 +323,8 @@ static void userdef_free_addons(UserDef *userdef)
 void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
 {
 #define U BLI_STATIC_ASSERT(false, "Global 'U' not allowed, only use arguments passed in!")
-#ifdef U /* quiet warning */
+#ifdef U
+  /* Quiet warning. */
 #endif
 
   userdef_free_keymaps(userdef);
diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c
index a435f8f037a2e986b5571a322116dc6d02104093..51c4aa8b3875afe3771eec5d9fcb1ccf71b6b628 100644
--- a/source/blender/blenlib/intern/array_store.c
+++ b/source/blender/blenlib/intern/array_store.c
@@ -1159,7 +1159,8 @@ static BChunkList *bchunk_list_from_data_merge(const BArrayInfo *info,
   /* Warning, from now on don't use len(data) since we want to ignore chunks already matched. */
   size_t data_len = data_len_original;
 #define data_len_original invalid_usage
-#ifdef data_len_original /* Quiet warning. */
+#ifdef data_len_original
+  /* Quiet warning. */
 #endif
 
   const BChunkRef *chunk_list_reference_last = NULL;
diff --git a/source/blender/bmesh/tools/bmesh_intersect.cc b/source/blender/bmesh/tools/bmesh_intersect.cc
index 3560030b4b54b719f324e37a11da8f67ab3e6e82..de805730b53bcaf51b7c6ea6652489df39bd7492 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.cc
+++ b/source/blender/bmesh/tools/bmesh_intersect.cc
@@ -30,8 +30,6 @@
 
 #include "BLI_linklist_stack.h"
 #include "BLI_utildefines_stack.h"
-#ifndef NDEBUG
-#endif
 
 #include "BLI_buffer.h"
 #include "BLI_kdopbvh.h"
diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc
index 6b80f449cd6b4a01ae5d0a0df4cdebf5ba60649d..4f8f4b2d596ed7d907dd468d912a9edcc78a404e 100644
--- a/source/blender/editors/space_script/space_script.cc
+++ b/source/blender/editors/space_script/space_script.cc
@@ -28,9 +28,6 @@
 
 #include "BLO_read_write.hh"
 
-#ifdef WITH_PYTHON
-#endif
-
 #include "script_intern.h" /* own include */
 
 // static script_run_python(char *funcname, )