diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 3ced56ae30..31131c3e19 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -28,7 +28,6 @@ config("audio_device_warnings_config") {
       # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
       "-Wno-delete-non-virtual-dtor",
       "-Wno-microsoft-goto",
-      "-Wno-reorder",
     ]
   }
 }
diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc
index 7df2cd03d2..fef8e50ffd 100644
--- a/modules/audio_device/win/audio_device_core_win.cc
+++ b/modules/audio_device/win/audio_device_core_win.cc
@@ -381,7 +381,9 @@ bool AudioDeviceWindowsCore::CoreAudioIsSupported() {
 // ----------------------------------------------------------------------------
 
 AudioDeviceWindowsCore::AudioDeviceWindowsCore()
-    : _comInit(ScopedCOMInitializer::kMTA),
+    : _avrtLibrary(NULL),
+      _winSupportAvrt(false),
+      _comInit(ScopedCOMInitializer::kMTA),
       _ptrAudioBuffer(NULL),
       _ptrEnumerator(NULL),
       _ptrRenderCollection(NULL),
@@ -397,6 +399,15 @@ AudioDeviceWindowsCore::AudioDeviceWindowsCore()
       _dmo(NULL),
       _mediaBuffer(NULL),
       _builtInAecEnabled(false),
+      _hRenderSamplesReadyEvent(NULL),
+      _hPlayThread(NULL),
+      _hRenderStartedEvent(NULL),
+      _hShutdownRenderEvent(NULL),
+      _hCaptureSamplesReadyEvent(NULL),
+      _hRecThread(NULL),
+      _hCaptureStartedEvent(NULL),
+      _hShutdownCaptureEvent(NULL),
+      _hMmTask(NULL),
       _playAudioFrameSize(0),
       _playSampleRate(0),
       _playBlockSize(0),
@@ -409,17 +420,6 @@ AudioDeviceWindowsCore::AudioDeviceWindowsCore()
       _recSampleRate(0),
       _recBlockSize(0),
       _recChannels(2),
-      _avrtLibrary(NULL),
-      _winSupportAvrt(false),
-      _hRenderSamplesReadyEvent(NULL),
-      _hPlayThread(NULL),
-      _hCaptureSamplesReadyEvent(NULL),
-      _hRecThread(NULL),
-      _hShutdownRenderEvent(NULL),
-      _hShutdownCaptureEvent(NULL),
-      _hRenderStartedEvent(NULL),
-      _hCaptureStartedEvent(NULL),
-      _hMmTask(NULL),
       _initialized(false),
       _recording(false),
       _playing(false),
diff --git a/modules/audio_device/win/audio_device_core_win.h b/modules/audio_device/win/audio_device_core_win.h
index 20962d145b..7d06c8c890 100644
--- a/modules/audio_device/win/audio_device_core_win.h
+++ b/modules/audio_device/win/audio_device_core_win.h
@@ -281,14 +281,14 @@ class AudioDeviceWindowsCore : public AudioDeviceGeneric {
   uint32_t _devicePlayBlockSize;
   uint32_t _playChannels;
   uint32_t _sndCardPlayDelay;
+  uint32_t _sndCardRecDelay;
   UINT64 _writtenSamples;
+  UINT64 _readSamples;
 
   UINT _recAudioFrameSize;
   uint32_t _recSampleRate;
   uint32_t _recBlockSize;
   uint32_t _recChannels;
-  UINT64 _readSamples;
-  uint32_t _sndCardRecDelay;
 
   uint16_t _recChannelsPrioList[3];
   uint16_t _playChannelsPrioList[2];