diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.cc b/webrtc/modules/audio_processing/logging/apm_data_dumper.cc
index 491196e097..3202006d3c 100644
--- a/webrtc/modules/audio_processing/logging/apm_data_dumper.cc
+++ b/webrtc/modules/audio_processing/logging/apm_data_dumper.cc
@@ -37,6 +37,15 @@ std::string FormFileName(const char* name,
 
 }  // namespace
 
+#if WEBRTC_AEC_DEBUG_DUMP == 1
+ApmDataDumper::ApmDataDumper(int instance_index)
+    : instance_index_(instance_index) {}
+#else
+ApmDataDumper::ApmDataDumper(int instance_index) {}
+#endif
+
+ApmDataDumper::~ApmDataDumper() {}
+
 #if WEBRTC_AEC_DEBUG_DUMP == 1
 FILE* ApmDataDumper::GetRawFile(const char* name) {
   std::string filename =
diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.h b/webrtc/modules/audio_processing/logging/apm_data_dumper.h
index eb3ee881a6..230c6b3a3e 100644
--- a/webrtc/modules/audio_processing/logging/apm_data_dumper.h
+++ b/webrtc/modules/audio_processing/logging/apm_data_dumper.h
@@ -40,15 +40,12 @@ struct RawFileCloseFunctor {
 // Class that handles dumping of variables into files.
 class ApmDataDumper {
  public:
-// Constructor that takes an instance index that may
-// be used to distinguish data dumped from different
-// instances of the code.
-#if WEBRTC_AEC_DEBUG_DUMP == 1
-  explicit ApmDataDumper(int instance_index)
-      : instance_index_(instance_index) {}
-#else
-  explicit ApmDataDumper(int instance_index) {}
-#endif
+  // Constructor that takes an instance index that may
+  // be used to distinguish data dumped from different
+  // instances of the code.
+  explicit ApmDataDumper(int instance_index);
+
+  ~ApmDataDumper();
 
   // Reinitializes the data dumping such that new versions
   // of all files being dumped to are created.