9 files changed, 18 insertions, 10 deletions
diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp
index 1ba0afd8a1..635e4601c7 100644
--- a/servers/audio/audio_driver_dummy.cpp
+++ b/servers/audio/audio_driver_dummy.cpp
@@ -54,7 +54,7 @@ Error AudioDriverDummy::init() {
 };
 
 void AudioDriverDummy::thread_func(void *p_udata) {
-	AudioDriverDummy *ad = (AudioDriverDummy *)p_udata;
+	AudioDriverDummy *ad = static_cast<AudioDriverDummy *>(p_udata);
 
 	uint64_t usdelay = (ad->buffer_frames / float(ad->mix_rate)) * 1000000;
 
diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h
index 6324e2f5d3..68b523e086 100644
--- a/servers/audio/audio_driver_dummy.h
+++ b/servers/audio/audio_driver_dummy.h
@@ -40,7 +40,7 @@ class AudioDriverDummy : public AudioDriver {
 	Thread thread;
 	Mutex mutex;
 
-	int32_t *samples_in;
+	int32_t *samples_in = nullptr;
 
 	static void thread_func(void *p_udata);
 
diff --git a/servers/audio/audio_filter_sw.h b/servers/audio/audio_filter_sw.h
index 9e55662d0a..1ec1abd4d5 100644
--- a/servers/audio/audio_filter_sw.h
+++ b/servers/audio/audio_filter_sw.h
@@ -57,7 +57,7 @@ public:
 
 	class Processor { // simple filter processor
 
-		AudioFilterSW *filter;
+		AudioFilterSW *filter = nullptr;
 		Coeffs coeffs;
 		float ha1, ha2, hb1, hb2; //history
 		Coeffs incr_coeffs;
diff --git a/servers/audio/audio_rb_resampler.h b/servers/audio/audio_rb_resampler.h
index 3fbe684c3e..81ac6332e2 100644
--- a/servers/audio/audio_rb_resampler.h
+++ b/servers/audio/audio_rb_resampler.h
@@ -55,8 +55,8 @@ struct AudioRBResampler {
 		MIX_FRAC_MASK = MIX_FRAC_LEN - 1,
 	};
 
-	float *read_buf;
-	float *rb;
+	float *read_buf = nullptr;
+	float *rb = nullptr;
 
 	template <int C>
 	uint32_t _resample(AudioFrame *p_dest, int p_todo, int32_t p_increment);
diff --git a/servers/audio/effects/audio_effect_record.cpp b/servers/audio/effects/audio_effect_record.cpp
index a5866bb380..d68522e5b9 100644
--- a/servers/audio/effects/audio_effect_record.cpp
+++ b/servers/audio/effects/audio_effect_record.cpp
@@ -30,6 +30,11 @@
 
 #include "audio_effect_record.h"
 
+#ifdef TOOLS_ENABLED
+// FIXME: This file shouldn't depend on editor stuff.
+#include "editor/import/resource_importer_wav.h"
+#endif
+
 void AudioEffectRecordInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	if (!is_recording) {
 		for (int i = 0; i < p_frame_count; i++) {
@@ -57,7 +62,7 @@ void AudioEffectRecordInstance::_update_buffer() {
 }
 
 void AudioEffectRecordInstance::_update(void *userdata) {
-	AudioEffectRecordInstance *ins = (AudioEffectRecordInstance *)userdata;
+	AudioEffectRecordInstance *ins = static_cast<AudioEffectRecordInstance *>(userdata);
 	ins->_update_buffer();
 }
 
@@ -250,8 +255,12 @@ Ref<AudioStreamSample> AudioEffectRecord::get_recording() const {
 		Vector<uint8_t> bleft;
 		Vector<uint8_t> bright;
 
+#ifdef TOOLS_ENABLED
 		ResourceImporterWAV::_compress_ima_adpcm(left, bleft);
 		ResourceImporterWAV::_compress_ima_adpcm(right, bright);
+#else
+		ERR_PRINT("AudioEffectRecord cannot do IMA ADPCM compression at runtime.");
+#endif
 
 		int dl = bleft.size();
 		dst_data.resize(dl * 2);
diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h
index 18b5d4d83c..305484d1cb 100644
--- a/servers/audio/effects/audio_effect_record.h
+++ b/servers/audio/effects/audio_effect_record.h
@@ -35,7 +35,6 @@
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
-#include "editor/import/resource_importer_wav.h"
 #include "scene/resources/audio_stream_sample.h"
 #include "servers/audio/audio_effect.h"
 #include "servers/audio_server.h"
diff --git a/servers/audio/effects/audio_effect_stereo_enhance.h b/servers/audio/effects/audio_effect_stereo_enhance.h
index 8b8b7b47a0..1f93d1cf9f 100644
--- a/servers/audio/effects/audio_effect_stereo_enhance.h
+++ b/servers/audio/effects/audio_effect_stereo_enhance.h
@@ -44,7 +44,7 @@ class AudioEffectStereoEnhanceInstance : public AudioEffectInstance {
 		MAX_DELAY_MS = 50
 	};
 
-	float *delay_ringbuff;
+	float *delay_ringbuff = nullptr;
 	unsigned int ringbuff_pos;
 	unsigned int ringbuff_mask;
 
diff --git a/servers/audio/effects/audio_stream_generator.h b/servers/audio/effects/audio_stream_generator.h
index 51288262b3..2ce4b95fcf 100644
--- a/servers/audio/effects/audio_stream_generator.h
+++ b/servers/audio/effects/audio_stream_generator.h
@@ -65,7 +65,7 @@ class AudioStreamGeneratorPlayback : public AudioStreamPlaybackResampled {
 	int skips;
 	bool active;
 	float mixed;
-	AudioStreamGenerator *generator;
+	AudioStreamGenerator *generator = nullptr;
 
 protected:
 	virtual int _mix_internal(AudioFrame *p_buffer, int p_frames) override;
diff --git a/servers/audio/effects/reverb.h b/servers/audio/effects/reverb.h
index ff59ab8d82..de25e8c52b 100644
--- a/servers/audio/effects/reverb.h
+++ b/servers/audio/effects/reverb.h
@@ -75,7 +75,7 @@ private:
 
 	Comb comb[MAX_COMBS];
 	AllPass allpass[MAX_ALLPASS];
-	float *input_buffer;
+	float *input_buffer = nullptr;
 	float *echo_buffer = nullptr;
 	int echo_buffer_size;
 	int echo_buffer_pos;