Remove or comment Ruler.h, Overlay.h, OverlayPanel.h in other headers

src/AdornedRulerPanel.h

@@ -12,7 +12,7 @@
 #define __AUDACITY_ADORNED_RULER_PANEL__
 
 #include "CellularPanel.h"
-#include "widgets/Ruler.h"
+#include "widgets/Ruler.h" // member variable
 
 #include "MemoryX.h"
 

src/CellularPanel.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_CELLULAR_PANEL__
 #define __AUDACITY_CELLULAR_PANEL__
 
-#include "widgets/OverlayPanel.h"
+#include "widgets/OverlayPanel.h" // to inherit
 
 class ViewInfo;
 class AudacityProject;

src/effects/Equalization.h

@@ -26,7 +26,6 @@
 #include "Effect.h"
 #include "../xml/XMLTagHandler.h"
 #include "../widgets/Grid.h"
-#include "../widgets/Ruler.h"
 #include "../RealFFTf.h"
 #include "../SampleFormat.h"
 
@@ -58,6 +57,7 @@ class wxStaticText;
 class Envelope;
 class EnvelopeEditor;
 class EqualizationPanel;
+class RulerPanel;
 
 //
 // One point in a curve

src/tracks/ui/EditCursorOverlay.h

@@ -12,7 +12,7 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_EDIT_CURSOR_OVERLAY__
 
 #include <memory>
-#include "../../widgets/Overlay.h"
+#include "../../widgets/Overlay.h" // to inherit
 
 class AudacityProject;
 

src/tracks/ui/PlayIndicatorOverlay.h

@@ -13,7 +13,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <wx/event.h> // to inherit
 #include "../../MemoryX.h"
-#include "../../widgets/Overlay.h"
+#include "../../widgets/Overlay.h" // to inherit
 
 class AudacityProject;
 

src/tracks/ui/Scrubbing.h

@@ -17,7 +17,7 @@ Paul Licameli split from TrackPanel.cpp
 #include <vector>
 #include <wx/longlong.h>
 
-#include "../../widgets/Overlay.h"
+#include "../../widgets/Overlay.h" // to inherit
 #include "../../commands/CommandFunctors.h"
 #include "../../commands/CommandContext.h"
 #include "../../commands/CommandManager.h" // for MenuTable

src/widgets/Meter.h

@@ -22,7 +22,7 @@
 #include <wx/timer.h> // member variable
 
 #include "../SampleFormat.h"
-#include "Ruler.h"
+#include "Ruler.h" // member variable
 
 class AudacityProject;