diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index 9dd6ec7e4..6f350ef28 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -28,6 +28,8 @@
 #include "Project.h"
 #include "WaveTrack.h"
 
+#include "widgets/Meter.h"
+
 
 #include "../images/MusicalInstruments.h"
 #ifdef __WXMSW__
diff --git a/src/MixerBoard.h b/src/MixerBoard.h
index 057420226..15e9522dd 100644
--- a/src/MixerBoard.h
+++ b/src/MixerBoard.h
@@ -24,7 +24,6 @@
 
 #include "widgets/AButton.h"
 #include "widgets/ASlider.h"
-#include "widgets/Meter.h"
 
 // containment hierarchy:
 //    MixerBoardFrame -> MixerBoard -> MixerBoardScrolledWindow -> MixerTrackCluster(s)
@@ -45,7 +44,7 @@ public:
                      bool canUseShift = true,
                      float stepValue = STEP_CONTINUOUS,
                      int orientation = wxHORIZONTAL);
-   virtual ~MixerTrackSlider() {};
+   virtual ~MixerTrackSlider() {}
 
    void OnMouseEvent(wxMouseEvent & event);
 
@@ -61,6 +60,7 @@ public:
 
 
 class AudacityProject;
+class Meter;
 class MixerBoard;
 #ifdef EXPERIMENTAL_MIDI_OUT
 class Track;
@@ -76,7 +76,7 @@ public:
                      WaveTrack* pLeftTrack, WaveTrack* pRightTrack = NULL,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize);
-   virtual ~MixerTrackCluster() {};
+   virtual ~MixerTrackCluster() {}
 
    void HandleResize(); // For wxSizeEvents, update gain slider and meter.
 
diff --git a/src/Project.cpp b/src/Project.cpp
index 7d9d72999..21bdbe262 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -121,7 +121,6 @@ scroll information.  It also has some status flags.
 #include "prefs/PrefsDialog.h"
 #include "widgets/LinkingHtmlWindow.h"
 #include "widgets/ErrorDialog.h"
-#include "widgets/Meter.h"
 #include "widgets/Ruler.h"
 #include "widgets/Warning.h"
 #include "xml/XMLFileReader.h"