diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index 289f29c7d..30b4ecbfc 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -110,7 +110,7 @@ private:
    int mSelectedCommand;
    bool mChanged;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index 0bc19e03d..09f4e979d 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -118,7 +118,7 @@ private:
 private:
     FreqWindow *freqWindow;
 
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 };
 
 class FreqWindow final : public wxDialogWrapper
@@ -213,7 +213,7 @@ private:
 
    std::unique_ptr<SpectrumAnalyst> mAnalyst;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class FreqPlot;
 };
diff --git a/src/LabelDialog.h b/src/LabelDialog.h
index 94bf58f24..ceb3dad03 100644
--- a/src/LabelDialog.h
+++ b/src/LabelDialog.h
@@ -100,7 +100,7 @@ class LabelDialog final : public wxDialogWrapper
 
    int mInitialRow;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/SoundActivatedRecord.h b/src/SoundActivatedRecord.h
index 44fe8b327..366fca4a5 100644
--- a/src/SoundActivatedRecord.h
+++ b/src/SoundActivatedRecord.h
@@ -31,7 +31,7 @@ private:
 
    void PopulateOrExchange(ShuttleGui& S);
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/TimeDialog.h b/src/TimeDialog.h
index a4e9c86af..ffe10ce31 100644
--- a/src/TimeDialog.h
+++ b/src/TimeDialog.h
@@ -53,7 +53,7 @@ class TimeDialog final : public wxDialogWrapper
 
    NumericTextCtrl *mTimeCtrl;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h
index 9daf64998..32a054827 100644
--- a/src/TimerRecordDialog.h
+++ b/src/TimerRecordDialog.h
@@ -147,7 +147,7 @@ private:
    wxString m_sTimerAfterCompleteOption;
    wxArrayString m_sTimerAfterCompleteOptionsArray;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h
index aa36513ae..017b80e33 100644
--- a/src/effects/Amplify.h
+++ b/src/effects/Amplify.h
@@ -82,7 +82,7 @@ private:
    wxTextCtrl *mNewPeakT;
    wxCheckBox *mClip;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif // __AUDACITY_EFFECT_AMPLIFY__
diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h
index 6f64472a8..79db8f4c0 100644
--- a/src/effects/AutoDuck.h
+++ b/src/effects/AutoDuck.h
@@ -85,7 +85,7 @@ private:
    wxTextCtrl *mMaximumPauseBox;
    EffectAutoDuckPanel *mPanel;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class EffectAutoDuckPanel;
 };
@@ -132,7 +132,7 @@ private:
    wxPoint mMouseDownPoint;
    bool mControlPointMoveActivated;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h
index 7bf3dc67f..ece660fa5 100644
--- a/src/effects/BassTreble.h
+++ b/src/effects/BassTreble.h
@@ -122,7 +122,7 @@ private:
 
    wxCheckBox  *mLinkCheckBox;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h
index 6de394d86..da4843e99 100644
--- a/src/effects/ChangePitch.h
+++ b/src/effects/ChangePitch.h
@@ -146,7 +146,7 @@ private:
    wxCheckBox *   mUseSBSMSCheckBox;
 #endif
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif // __AUDACITY_EFFECT_CHANGEPITCH__
diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h
index 7643c3bc8..93fddc0b1 100644
--- a/src/effects/ChangeSpeed.h
+++ b/src/effects/ChangeSpeed.h
@@ -115,7 +115,7 @@ private:
    double   mToLength;        // target length of selection
    wxString mFormat;          // time control format
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif // __AUDACITY_EFFECT_CHANGESPEED__
diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h
index 1b83ae94f..33ee049f6 100644
--- a/src/effects/ChangeTempo.h
+++ b/src/effects/ChangeTempo.h
@@ -102,7 +102,7 @@ private:
    wxCheckBox *   mUseSBSMSCheckBox;
 #endif
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif // __AUDACITY_EFFECT_CHANGETEMPO__
diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h
index c9a2f78f6..1fdf1f9f0 100644
--- a/src/effects/ClickRemoval.h
+++ b/src/effects/ClickRemoval.h
@@ -82,7 +82,7 @@ private:
    wxTextCtrl *mWidthT;
    wxTextCtrl *mThreshT;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h
index 1f95a67d2..87cefd86f 100644
--- a/src/effects/Compressor.h
+++ b/src/effects/Compressor.h
@@ -131,7 +131,7 @@ private:
    wxCheckBox *mGainCheckBox;
    wxCheckBox *mPeakCheckBox;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class EffectCompressorPanel final : public wxPanelWrapper
@@ -151,7 +151,7 @@ private:
    double & noiseFloor;
    double & ratio;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h
index bce4877aa..6e3bcc726 100644
--- a/src/effects/Distortion.h
+++ b/src/effects/Distortion.h
@@ -212,7 +212,7 @@ private:
 
    Params mParams;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h
index 1b93cffae..c5a38b1ee 100644
--- a/src/effects/DtmfGen.h
+++ b/src/effects/DtmfGen.h
@@ -98,7 +98,7 @@ private:
    wxStaticText *mDtmfSilenceT;
    wxStaticText *mDtmfDutyT;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index f0e667d00..4383fb7c0 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -564,7 +564,7 @@ private:
    int mType;
    int mAdditionalButtons;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 //
@@ -656,7 +656,7 @@ private:
 
    bool mDismissed{};
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class EffectPresetsDialog final : public wxDialogWrapper
@@ -684,7 +684,7 @@ private:
    wxArrayString mUserPresets;
    wxString mSelection;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 // Utility functions
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index 8b7171180..8b975e389 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -272,7 +272,7 @@ private:
    wxBoxSizer *szrM;
 #endif
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class EqualizationPanel;
    friend class EditCurvesDialog;
@@ -324,7 +324,7 @@ private:
 //   double mLoFreq;
 //   double mHiFreq;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 // EditCurvesDialog.  Note that the 'modified' curve used to be called 'custom' but is now called 'unnamed'
diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h
index 8096b7841..64ac34119 100644
--- a/src/effects/Normalize.h
+++ b/src/effects/Normalize.h
@@ -90,7 +90,7 @@ private:
 
    bool mCreating;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Paulstretch.h b/src/effects/Paulstretch.h
index 301c29355..e908c2b78 100644
--- a/src/effects/Paulstretch.h
+++ b/src/effects/Paulstretch.h
@@ -59,7 +59,7 @@ private:
    float mTime_resolution;  //seconds
    double m_t1;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h
index d8d203d4d..3f628be41 100644
--- a/src/effects/Phaser.h
+++ b/src/effects/Phaser.h
@@ -146,7 +146,7 @@ private:
    wxSlider *mFeedbackS;
    wxSlider *mOutGainS;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h
index c829c65ee..e7d88f8ad 100644
--- a/src/effects/Repeat.h
+++ b/src/effects/Repeat.h
@@ -62,7 +62,7 @@ private:
    wxStaticText *mCurrentTime;
    wxStaticText *mTotalTime;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp
index ce367b71e..d11e7b55b 100644
--- a/src/effects/Reverb.cpp
+++ b/src/effects/Reverb.cpp
@@ -422,15 +422,15 @@ void EffectReverb::PopulateOrExchange(ShuttleGui & S)
       m ## n ## S = S.Id(ID_ ## n). \
          AddSlider(wxT(""), DEF_ ## n, MAX_ ## n, MIN_ ## n);
 
-      SpinSlider(RoomSize,       _("&Room Size (%):"));
-      SpinSlider(PreDelay,       _("&Pre-delay (ms):"));
-      SpinSlider(Reverberance,   _("Rever&berance (%):"));
-      SpinSlider(HfDamping,      _("Da&mping (%):"));
-      SpinSlider(ToneLow,        _("Tone &Low (%):"));
-      SpinSlider(ToneHigh,       _("Tone &High (%):"));
-      SpinSlider(WetGain,        _("Wet &Gain (dB):"));
-      SpinSlider(DryGain,        _("Dr&y Gain (dB):"));
-      SpinSlider(StereoWidth,    _("Stereo Wid&th (%):"));
+      SpinSlider(RoomSize,       _("&Room Size (%):"))
+      SpinSlider(PreDelay,       _("&Pre-delay (ms):"))
+      SpinSlider(Reverberance,   _("Rever&berance (%):"))
+      SpinSlider(HfDamping,      _("Da&mping (%):"))
+      SpinSlider(ToneLow,        _("Tone &Low (%):"))
+      SpinSlider(ToneHigh,       _("Tone &High (%):"))
+      SpinSlider(WetGain,        _("Wet &Gain (dB):"))
+      SpinSlider(DryGain,        _("Dr&y Gain (dB):"))
+      SpinSlider(StereoWidth,    _("Stereo Wid&th (%):"))
 
 #undef SpinSlider
 
@@ -507,15 +507,15 @@ bool EffectReverb::TransferDataFromWindow()
       mProcessingEvent = false; \
    }
 
-SpinSliderHandlers(RoomSize);
-SpinSliderHandlers(PreDelay);
-SpinSliderHandlers(Reverberance);
-SpinSliderHandlers(HfDamping);
-SpinSliderHandlers(ToneLow);
-SpinSliderHandlers(ToneHigh);
-SpinSliderHandlers(WetGain);
-SpinSliderHandlers(DryGain);
-SpinSliderHandlers(StereoWidth);
+SpinSliderHandlers(RoomSize)
+SpinSliderHandlers(PreDelay)
+SpinSliderHandlers(Reverberance)
+SpinSliderHandlers(HfDamping)
+SpinSliderHandlers(ToneLow)
+SpinSliderHandlers(ToneHigh)
+SpinSliderHandlers(WetGain)
+SpinSliderHandlers(DryGain)
+SpinSliderHandlers(StereoWidth)
 
 #undef SpinSliderHandlers
 
diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h
index 6757a450d..5d9600b36 100644
--- a/src/effects/Reverb.h
+++ b/src/effects/Reverb.h
@@ -83,15 +83,15 @@ private:
    void On ## n ## Slider(wxCommandEvent & evt); \
    void On ## n ## Text(wxCommandEvent & evt);
 
-   SpinSliderHandlers(RoomSize);
-   SpinSliderHandlers(PreDelay);
-   SpinSliderHandlers(Reverberance);
-   SpinSliderHandlers(HfDamping);
-   SpinSliderHandlers(ToneLow);
-   SpinSliderHandlers(ToneHigh);
-   SpinSliderHandlers(WetGain);
-   SpinSliderHandlers(DryGain);
-   SpinSliderHandlers(StereoWidth);
+   SpinSliderHandlers(RoomSize)
+   SpinSliderHandlers(PreDelay)
+   SpinSliderHandlers(Reverberance)
+   SpinSliderHandlers(HfDamping)
+   SpinSliderHandlers(ToneLow)
+   SpinSliderHandlers(ToneHigh)
+   SpinSliderHandlers(WetGain)
+   SpinSliderHandlers(DryGain)
+   SpinSliderHandlers(StereoWidth)
 
 #undef SpinSliderHandlers
 
@@ -107,21 +107,21 @@ private:
    wxSpinCtrl  *m ## n ## T; \
    wxSlider    *m ## n ## S;
 
-   SpinSlider(RoomSize);
-   SpinSlider(PreDelay);
-   SpinSlider(Reverberance);
-   SpinSlider(HfDamping);
-   SpinSlider(ToneLow);
-   SpinSlider(ToneHigh);
-   SpinSlider(WetGain);
-   SpinSlider(DryGain);
-   SpinSlider(StereoWidth);
+   SpinSlider(RoomSize)
+   SpinSlider(PreDelay)
+   SpinSlider(Reverberance)
+   SpinSlider(HfDamping)
+   SpinSlider(ToneLow)
+   SpinSlider(ToneHigh)
+   SpinSlider(WetGain)
+   SpinSlider(DryGain)
+   SpinSlider(StereoWidth)
 
 #undef SpinSlider
 
    wxCheckBox  *mWetOnlyC;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h
index da47af1f0..3556e86f3 100644
--- a/src/effects/ScienFilter.h
+++ b/src/effects/ScienFilter.h
@@ -130,7 +130,7 @@ private:
    RulerPanel *mdBRuler;
    RulerPanel *mfreqRuler;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class EffectScienFilterPanel;
 };
@@ -170,7 +170,7 @@ private:
 
    friend class EffectScienFilter;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #if wxUSE_ACCESSIBILITY
diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h
index 015e1c622..411f32a34 100644
--- a/src/effects/TimeScale.h
+++ b/src/effects/TimeScale.h
@@ -104,7 +104,7 @@ private:
    wxTextCtrl *m_pTextCtrl_PitchPercentChangeStart;
    wxTextCtrl *m_pTextCtrl_PitchPercentChangeEnd;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif // __AUDACITY_EFFECT_TIMESCALE
diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h
index 943cd8166..26ed3f849 100644
--- a/src/effects/ToneGen.h
+++ b/src/effects/ToneGen.h
@@ -79,7 +79,7 @@ private:
    wxArrayString mInterpolations;
    NumericTextCtrl *mToneDurationT;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h
index c19ffacfc..32647c33c 100644
--- a/src/effects/TruncSilence.h
+++ b/src/effects/TruncSilence.h
@@ -113,7 +113,7 @@ private:
    wxTextCtrl *mSilenceCompressPercentT;
    wxCheckBox *mIndependent;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
index a9586eece..6fd87e9c8 100644
--- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
@@ -154,7 +154,7 @@ public:
 
    void OnExit() {};
 
-   DECLARE_DYNAMIC_CLASS(VSTSubEntry);
+   DECLARE_DYNAMIC_CLASS(VSTSubEntry)
 };
 IMPLEMENT_DYNAMIC_CLASS(VSTSubEntry, wxModule);
 
diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h
index 7b8d5cdf0..af4f8fdee 100644
--- a/src/effects/VST/VSTEffect.h
+++ b/src/effects/VST/VSTEffect.h
@@ -354,7 +354,7 @@ private:
    long mXMLVersion;
    VstPatchChunkInfo mXMLInfo;
    
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class VSTEffectsModule;
 };
diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h
index 35ec02587..440b10ced 100644
--- a/src/effects/Wahwah.h
+++ b/src/effects/Wahwah.h
@@ -138,7 +138,7 @@ private:
    wxSlider *mFreqOfsS;
    wxSlider *mOutGainS;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/audiounits/AUControl.h b/src/effects/audiounits/AUControl.h
index 6cbe91c48..9dd963f1c 100644
--- a/src/effects/audiounits/AUControl.h
+++ b/src/effects/audiounits/AUControl.h
@@ -65,7 +65,7 @@ private:
    HIViewRef mHIView;
 #endif
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp
index 793dbcc2c..4d3e8d860 100644
--- a/src/effects/ladspa/LadspaEffect.cpp
+++ b/src/effects/ladspa/LadspaEffect.cpp
@@ -447,7 +447,7 @@ private:
    float mMax;
    float mLastValue;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(LadspaEffectMeter, wxWindow)
diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h
index 7c3600af6..7e2aeb5bd 100644
--- a/src/effects/ladspa/LadspaEffect.h
+++ b/src/effects/ladspa/LadspaEffect.h
@@ -191,7 +191,7 @@ private:
    wxCheckBox **mToggles;
    LadspaEffectMeter **mMeters;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class LadspaEffectsModule;
 };
diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp
index 91b123cc6..3625b5645 100644
--- a/src/effects/lv2/LV2Effect.cpp
+++ b/src/effects/lv2/LV2Effect.cpp
@@ -87,7 +87,7 @@ private:
    const LV2Port & mCtrl;
    float mLastValue;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(LV2EffectMeter, wxWindow)
@@ -182,7 +182,7 @@ private:
    bool mUseLatency;
    bool mUseGUI;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(LV2EffectSettingsDialog, wxDialogWrapper)
diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h
index 277de6019..050059c2e 100644
--- a/src/effects/lv2/LV2Effect.h
+++ b/src/effects/lv2/LV2Effect.h
@@ -248,7 +248,7 @@ private:
    // Declare the static URI nodes
    #undef URI
    #define URI(n, u) static LilvNode *n;
-   URILIST;
+   URILIST
 
    const LilvPlugin *mPlug;
 
@@ -321,7 +321,7 @@ private:
    wxArrayString mFactoryPresetNames;
    wxArrayString mFactoryPresetUris;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class LV2EffectSettingsDialog;
    friend class LV2EffectsModule;
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index 86fdea995..a26a3d038 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -237,7 +237,7 @@ private:
    wxTextCtrl *mCommandText;
    wxCheckBox *mVersionCheckBox;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class NyquistEffectsModule;
 };
@@ -254,7 +254,7 @@ private:
    void OnOk(wxCommandEvent & event);
 
 private:
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 
diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h
index 336a2c863..69b1a3c53 100644
--- a/src/effects/vamp/VampEffect.h
+++ b/src/effects/vamp/VampEffect.h
@@ -108,7 +108,7 @@ private:
    wxChoice **mChoices;
    wxChoice *mProgram;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/export/Export.h b/src/export/Export.h
index 2c8e895c5..f039d8316 100644
--- a/src/export/Export.h
+++ b/src/export/Export.h
@@ -210,7 +210,7 @@ private:
 
    wxSimplebook *mBook;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h
index cfe8cf0d9..88f847035 100644
--- a/src/export/ExportFFmpegDialogs.h
+++ b/src/export/ExportFFmpegDialogs.h
@@ -161,7 +161,7 @@ public:
 
 private:
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 /// Entry for the Applicability table
@@ -217,7 +217,7 @@ private:
    wxArrayString mCodecLongNames;
    wxArrayString mProfileNames;
    wxArrayInt    mProfileLabels;
-   wxArrayString mPredictionOrderMethodNames;;
+   wxArrayString mPredictionOrderMethodNames;
    wxArrayInt    mPredictionOrderMethodLabels;
 
    wxChoice *mFormatChoice;
diff --git a/src/prefs/BatchPrefs.h b/src/prefs/BatchPrefs.h
index 971fff43d..c97ff32e7 100644
--- a/src/prefs/BatchPrefs.h
+++ b/src/prefs/BatchPrefs.h
@@ -31,7 +31,7 @@ private:
    void Populate();
    void PopulateOrExchange(ShuttleGui & S);
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class BatchPrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h
index 1fa8ed4ae..9a51acec8 100644
--- a/src/prefs/DevicePrefs.h
+++ b/src/prefs/DevicePrefs.h
@@ -51,7 +51,7 @@ class DevicePrefs final : public PrefsPanel
    wxChoice *mRecord;
    wxChoice *mChannels;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class DevicePrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h
index 4c1efe531..d9ebdcc04 100644
--- a/src/prefs/DirectoriesPrefs.h
+++ b/src/prefs/DirectoriesPrefs.h
@@ -35,7 +35,7 @@ class DirectoriesPrefs final : public PrefsPanel
    wxStaticText *mFreeSpace;
    wxTextCtrl *mTempDir;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class DirectoriesPrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h
index c60464d5f..1823ba40f 100644
--- a/src/prefs/KeyConfigPrefs.h
+++ b/src/prefs/KeyConfigPrefs.h
@@ -88,7 +88,7 @@ private:
    wxArrayString mKeys;
    wxArrayString mNewKeys; // Used for work in progress.
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #else
@@ -143,7 +143,7 @@ class KeyConfigPrefs final : public PrefsPanel
    wxArrayString mKeys;
    wxArrayString mNewKeys; // Used for work in progress.
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h
index 80eb3ee47..2de4c9cf8 100644
--- a/src/prefs/LibraryPrefs.h
+++ b/src/prefs/LibraryPrefs.h
@@ -43,7 +43,7 @@ class LibraryPrefs final : public PrefsPanel
    wxStaticText *mMP3Version;
    wxStaticText *mFFmpegVersion;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class LibraryPrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h
index be5a70211..637208208 100644
--- a/src/prefs/MidiIOPrefs.h
+++ b/src/prefs/MidiIOPrefs.h
@@ -59,7 +59,7 @@ class MidiIOPrefs final : public PrefsPanel
 #endif
 //   wxChoice *mChannels;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class MidiIOPrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h
index a55fd12a3..3d37a5a22 100644
--- a/src/prefs/QualityPrefs.h
+++ b/src/prefs/QualityPrefs.h
@@ -50,7 +50,7 @@ class QualityPrefs final : public PrefsPanel
    wxTextCtrl *mOtherSampleRate;
    int mOtherSampleRateValue;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class QualityPrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h
index 58e3fb030..4ad617400 100644
--- a/src/prefs/RecordingPrefs.h
+++ b/src/prefs/RecordingPrefs.h
@@ -37,7 +37,7 @@ class RecordingPrefs final : public PrefsPanel
    bool mUseCustomTrackName;
    bool mOldNameChoice;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class RecordingPrefsFactory final : public PrefsPanelFactory
diff --git a/src/prefs/ThemePrefs.h b/src/prefs/ThemePrefs.h
index 15ffdcbb9..ccfaa3eaf 100644
--- a/src/prefs/ThemePrefs.h
+++ b/src/prefs/ThemePrefs.h
@@ -38,7 +38,7 @@ class ThemePrefs final : public PrefsPanel
    void OnReadThemeInternal(wxCommandEvent & e);
    void OnSaveThemeAsCode(wxCommandEvent & e);
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class ThemePrefsFactory final : public PrefsPanelFactory
diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h
index 576b60059..7955fcb98 100644
--- a/src/toolbars/ControlToolBar.h
+++ b/src/toolbars/ControlToolBar.h
@@ -171,8 +171,8 @@ class ControlToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(ControlToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(ControlToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h
index 09237564f..d2d443269 100644
--- a/src/toolbars/DeviceToolBar.h
+++ b/src/toolbars/DeviceToolBar.h
@@ -77,8 +77,8 @@ class DeviceToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(DeviceToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(DeviceToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h
index 8f8cbfe67..9364b71e6 100644
--- a/src/toolbars/EditToolBar.h
+++ b/src/toolbars/EditToolBar.h
@@ -93,8 +93,8 @@ class EditToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(EditToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(EditToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/MeterToolBar.h b/src/toolbars/MeterToolBar.h
index e6af911aa..679d4046f 100644
--- a/src/toolbars/MeterToolBar.h
+++ b/src/toolbars/MeterToolBar.h
@@ -63,8 +63,8 @@ class MeterToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(MeterToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(MeterToolBar)
+   DECLARE_EVENT_TABLE()
 
 };
 
diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h
index af0c2b05c..9f7ad84b1 100644
--- a/src/toolbars/MixerToolBar.h
+++ b/src/toolbars/MixerToolBar.h
@@ -68,8 +68,8 @@ class MixerToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(MixerToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(MixerToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/ScrubbingToolBar.h b/src/toolbars/ScrubbingToolBar.h
index bd16cd719..48bc0b2f1 100644
--- a/src/toolbars/ScrubbingToolBar.h
+++ b/src/toolbars/ScrubbingToolBar.h
@@ -69,8 +69,8 @@ private:
 
 public:
 
-   DECLARE_CLASS(EditToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(EditToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h
index 68a547ae1..b0cdb53da 100644
--- a/src/toolbars/SelectionBar.h
+++ b/src/toolbars/SelectionBar.h
@@ -92,8 +92,8 @@ class SelectionBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(SelectionBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(SelectionBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h
index 54ad0bc32..4cb9e6946 100644
--- a/src/toolbars/SpectralSelectionBar.h
+++ b/src/toolbars/SpectralSelectionBar.h
@@ -76,8 +76,8 @@ private:
 
 public:
 
-   DECLARE_CLASS(SpectralSelectionBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(SpectralSelectionBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp
index b1a80af79..dba0f6876 100644
--- a/src/toolbars/ToolBar.cpp
+++ b/src/toolbars/ToolBar.cpp
@@ -91,7 +91,7 @@ private:
    wxSize mOrigSize;
    wxWindow *mOrigFocus{};
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 //
diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h
index e92ce9ee2..79ace9a3b 100644
--- a/src/toolbars/ToolBar.h
+++ b/src/toolbars/ToolBar.h
@@ -234,8 +234,8 @@ class ToolBar /* not final */ : public wxPanelWrapper
 
  public:
 
-   DECLARE_CLASS(ToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(ToolBar)
+   DECLARE_EVENT_TABLE()
 
    friend class ToolBarResizer;
 };
diff --git a/src/toolbars/ToolDock.h b/src/toolbars/ToolDock.h
index 20c56e8ea..bda379eaf 100644
--- a/src/toolbars/ToolDock.h
+++ b/src/toolbars/ToolDock.h
@@ -340,8 +340,8 @@ public:
 
  public:
 
-   DECLARE_CLASS( ToolDock );
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS( ToolDock )
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h
index 71e9c277e..2a229ea87 100644
--- a/src/toolbars/ToolManager.h
+++ b/src/toolbars/ToolManager.h
@@ -122,8 +122,8 @@ class ToolManager final : public wxEvtHandler
 
  public:
 
-   DECLARE_CLASS( ToolManager );
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS( ToolManager )
+   DECLARE_EVENT_TABLE()
 };
 
 
@@ -181,8 +181,8 @@ private:
 
 public:
 
-   DECLARE_CLASS( ToolFrame );
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS( ToolFrame )
+   DECLARE_EVENT_TABLE()
 };
 
 
diff --git a/src/toolbars/ToolsToolBar.h b/src/toolbars/ToolsToolBar.h
index 0e76696c9..cc3ec7215 100644
--- a/src/toolbars/ToolsToolBar.h
+++ b/src/toolbars/ToolsToolBar.h
@@ -82,8 +82,8 @@ class ToolsToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(ToolsToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(ToolsToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h
index 7994fcf8b..f039cacf4 100644
--- a/src/toolbars/TranscriptionToolBar.h
+++ b/src/toolbars/TranscriptionToolBar.h
@@ -157,8 +157,8 @@ class TranscriptionToolBar final : public ToolBar {
 
  public:
 
-   DECLARE_CLASS(TranscriptionToolBar);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(TranscriptionToolBar)
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/widgets/AButton.cpp b/src/widgets/AButton.cpp
index fd34af311..010494ad0 100644
--- a/src/widgets/AButton.cpp
+++ b/src/widgets/AButton.cpp
@@ -59,8 +59,8 @@ public:
    void OnKeyUp(wxKeyEvent & event);
    void OnTimer(wxTimerEvent & event);
 
-   DECLARE_CLASS(AButton::Listener);
-   DECLARE_EVENT_TABLE();
+   DECLARE_CLASS(AButton::Listener)
+   DECLARE_EVENT_TABLE()
 
 private:
    AButton *mButton;
diff --git a/src/widgets/AttachableScrollBar.h b/src/widgets/AttachableScrollBar.h
index 71a40a0da..1fcc03033 100644
--- a/src/widgets/AttachableScrollBar.h
+++ b/src/widgets/AttachableScrollBar.h
@@ -40,7 +40,7 @@ public:
    void SetViewInfoFromScrollBar();
 
    ViewInfo * mpViewInfo;
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif // __AUDACITY_ATTACHABLE_SCROLL_BAR__
diff --git a/src/widgets/ExpandingToolBar.cpp b/src/widgets/ExpandingToolBar.cpp
index c3394ec6a..232acb2b9 100644
--- a/src/widgets/ExpandingToolBar.cpp
+++ b/src/widgets/ExpandingToolBar.cpp
@@ -309,7 +309,7 @@ protected:
    wxWindow *mWindow;
    wxEvtHandler *mInheritedEvtHandler;
 
-   DECLARE_NO_COPY_CLASS(ExpandingToolBarEvtHandler);
+   DECLARE_NO_COPY_CLASS(ExpandingToolBarEvtHandler)
 };
 
 void ExpandingToolBar::RecursivelyPushEventHandlers(wxWindow *win)
diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h
index 42c122cd2..2b8034004 100644
--- a/src/widgets/ExpandingToolBar.h
+++ b/src/widgets/ExpandingToolBar.h
@@ -121,7 +121,7 @@ class ExpandingToolBar final : public wxPanelWrapper
 
    static int msNoAutoExpandStack;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
    friend class ExpandingToolBarEvtHandler;
    std::vector< movable_ptr< ExpandingToolBarEvtHandler > > mHandlers;
@@ -130,7 +130,7 @@ class ExpandingToolBar final : public wxPanelWrapper
 class ToolBarGrabber final : public wxPanelWrapper
 {
  public:
-   DECLARE_DYNAMIC_CLASS(ToolBarGrabber);
+   DECLARE_DYNAMIC_CLASS(ToolBarGrabber)
 
    ToolBarGrabber(wxWindow *parent,
                   wxWindowID id,
@@ -147,7 +147,7 @@ class ToolBarGrabber final : public wxPanelWrapper
    ImageRoll         mImageRoll[2];
    ExpandingToolBar *mOwnerToolBar;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class ToolBarDialog final : public wxDialogWrapper
diff --git a/src/widgets/Grabber.h b/src/widgets/Grabber.h
index fb8d02ef3..9d3acbfc0 100644
--- a/src/widgets/Grabber.h
+++ b/src/widgets/Grabber.h
@@ -132,7 +132,7 @@ class Grabber final : public wxWindow
 
  public:
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h
index 9110ceda8..9b44119e1 100644
--- a/src/widgets/Grid.h
+++ b/src/widgets/Grid.h
@@ -232,7 +232,7 @@ class Grid final : public wxGrid
 
  public:
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #if wxUSE_ACCESSIBILITY
diff --git a/src/widgets/ImageRoll.h b/src/widgets/ImageRoll.h
index b7793d646..252a39583 100644
--- a/src/widgets/ImageRoll.h
+++ b/src/widgets/ImageRoll.h
@@ -70,7 +70,7 @@ class ImageRoll
 class ImageRollPanel final : public wxPanelWrapper
 {
  public:
-   DECLARE_DYNAMIC_CLASS(ImageRollPanel);
+   DECLARE_DYNAMIC_CLASS(ImageRollPanel)
 
    ImageRollPanel(wxWindow *parent,
                   wxWindowID id,
@@ -89,7 +89,7 @@ class ImageRollPanel final : public wxPanelWrapper
 
    wxRasterOperationMode mLogicalFunction;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 
 };
 
diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h
index 521fe25d1..80febf4eb 100644
--- a/src/widgets/KeyView.h
+++ b/src/widgets/KeyView.h
@@ -162,7 +162,7 @@ private:
    KeyViewAx *mAx;
 #endif
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 #if wxUSE_ACCESSIBILITY
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index d638e7500..8c520e1d2 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -142,7 +142,7 @@ class NumericTextCtrl final : public wxControl, public NumericConverter
    friend class NumericTextCtrlAx;
 
  public:
-   DECLARE_DYNAMIC_CLASS(NumericTextCtrl);
+   DECLARE_DYNAMIC_CLASS(NumericTextCtrl)
 
    NumericTextCtrl(NumericConverter::Type type,
                    wxWindow *parent,
diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h
index 933ec590f..d916493b3 100644
--- a/src/widgets/ProgressDialog.h
+++ b/src/widgets/ProgressDialog.h
@@ -125,7 +125,7 @@ private:
    int mLastW;
    int mLastH;
 
-   DECLARE_EVENT_TABLE();
+   DECLARE_EVENT_TABLE()
 };
 
 class AUDACITY_DLL_API TimerProgressDialog final : public ProgressDialog
diff --git a/src/widgets/valnum.h b/src/widgets/valnum.h
index e2aa987fd..3a318790c 100644
--- a/src/widgets/valnum.h
+++ b/src/widgets/valnum.h
@@ -126,9 +126,9 @@ private:
     // Combination of wxVAL_NUM_XXX values.
     int m_style;
 
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 
-    DECLARE_NO_ASSIGN_CLASS(NumValidatorBase);
+    DECLARE_NO_ASSIGN_CLASS(NumValidatorBase)
 };
 
 namespace Private
@@ -257,7 +257,7 @@ private:
 
     ValueType * const m_value;
 
-    DECLARE_NO_ASSIGN_CLASS(NumValidator);
+    DECLARE_NO_ASSIGN_CLASS(NumValidator)
 };
 
 } // namespace Private
@@ -322,7 +322,7 @@ private:
     // Minimal and maximal values accepted (inclusive).
     LongestValueType m_min, m_max;
 
-    DECLARE_NO_ASSIGN_CLASS(IntegerValidatorBase);
+    DECLARE_NO_ASSIGN_CLASS(IntegerValidatorBase)
 };
 
 // Validator for integer numbers. It can actually work with any integer type
@@ -353,7 +353,7 @@ public:
     wxObject *Clone() const override { return safenew IntegerValidator(*this); }
 
 private:
-    DECLARE_NO_ASSIGN_CLASS(IntegerValidator);
+    DECLARE_NO_ASSIGN_CLASS(IntegerValidator)
 };
 
 // Helper function for creating integer validators which allows to avoid
@@ -425,7 +425,7 @@ private:
     // Minimal and maximal values accepted (inclusive).
     LongestValueType m_min, m_max;
 
-    DECLARE_NO_ASSIGN_CLASS(FloatingPointValidatorBase);
+    DECLARE_NO_ASSIGN_CLASS(FloatingPointValidatorBase)
 };
 
 // Validator for floating point numbers. It can be used with float, double or