diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h
index a43ccd2e1..ef9e54d04 100644
--- a/src/widgets/AButton.h
+++ b/src/widgets/AButton.h
@@ -17,7 +17,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/window.h> // to inherit
 
-#include "ImageRoll.h"
+#include "ImageRoll.h" // member variable
 
 class wxImage;
 
diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h
index 75a5f9b88..363f668ec 100644
--- a/src/widgets/ExpandingToolBar.h
+++ b/src/widgets/ExpandingToolBar.h
@@ -17,13 +17,14 @@
 #include <wx/timer.h> // member variable
 #include <wx/minifram.h> // to inherit
 
-#include "ImageRoll.h"
+#include "wxPanelWrapper.h" // to inherit
 
 #include <unordered_map>
 
 class AButton;
 
 class ExpandingToolBar;
+class ImageRollPanel;
 class ToolBarFrame;
 class ToolBarDialog;
 class ToolBarArea;