diff --git a/src/intel/compiler/brw_private.h b/src/intel/compiler/brw_private.h
index 0cddef9e051..70b6fd93179 100644
--- a/src/intel/compiler/brw_private.h
+++ b/src/intel/compiler/brw_private.h
@@ -27,10 +27,6 @@
 
 #include "brw_compiler.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 unsigned brw_required_dispatch_width(const struct shader_info *info);
 
 bool brw_simd_should_compile(void *mem_ctx,
@@ -50,8 +46,4 @@ int brw_simd_select_for_workgroup_size(const struct intel_device_info *devinfo,
                                        const struct brw_cs_prog_data *prog_data,
                                        const unsigned *sizes);
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif // BRW_PRIVATE_H
diff --git a/src/intel/compiler/brw_simd_selection.c b/src/intel/compiler/brw_simd_selection.cpp
similarity index 98%
rename from src/intel/compiler/brw_simd_selection.c
rename to src/intel/compiler/brw_simd_selection.cpp
index 558f4ccc734..18dc912029d 100644
--- a/src/intel/compiler/brw_simd_selection.c
+++ b/src/intel/compiler/brw_simd_selection.cpp
@@ -129,9 +129,9 @@ brw_simd_should_compile(void *mem_ctx,
    }
 
    const bool env_skip[3] = {
-      INTEL_DEBUG(DEBUG_NO8),
-      INTEL_DEBUG(DEBUG_NO16),
-      INTEL_DEBUG(DEBUG_NO32),
+      INTEL_DEBUG(DEBUG_NO8) != 0,
+      INTEL_DEBUG(DEBUG_NO16) != 0,
+      INTEL_DEBUG(DEBUG_NO32) != 0,
    };
 
    if (unlikely(env_skip[simd])) {
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 5b5baa4799f..f950b7ced7a 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -115,7 +115,7 @@ libintel_compiler_files = files(
   'brw_schedule_instructions.cpp',
   'brw_shader.cpp',
   'brw_shader.h',
-  'brw_simd_selection.c',
+  'brw_simd_selection.cpp',
   'brw_vec4_builder.h',
   'brw_vec4_cmod_propagation.cpp',
   'brw_vec4_copy_propagation.cpp',