diff --git a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp
index bd5ff9ff..eb5d5d13 100644
--- a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp
@@ -1,5 +1,6 @@
 #include <scwx/qt/map/color_table_layer.hpp>
 #include <scwx/qt/gl/shader_program.hpp>
+#include <scwx/qt/view/radar_product_view.hpp>
 #include <scwx/util/logger.hpp>
 
 #if defined(_MSC_VER)
diff --git a/scwx-qt/source/scwx/qt/map/map_context.cpp b/scwx-qt/source/scwx/qt/map/map_context.cpp
index 79d9c719..1270a306 100644
--- a/scwx-qt/source/scwx/qt/map/map_context.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_context.cpp
@@ -1,4 +1,6 @@
 #include <scwx/qt/map/map_context.hpp>
+#include <scwx/qt/map/map_settings.hpp>
+#include <scwx/qt/view/radar_product_view.hpp>
 
 namespace scwx
 {
diff --git a/scwx-qt/source/scwx/qt/map/map_context.hpp b/scwx-qt/source/scwx/qt/map/map_context.hpp
index fc2b893e..bdbd042f 100644
--- a/scwx-qt/source/scwx/qt/map/map_context.hpp
+++ b/scwx-qt/source/scwx/qt/map/map_context.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <scwx/qt/gl/gl_context.hpp>
-#include <scwx/qt/map/map_settings.hpp>
-#include <scwx/qt/view/radar_product_view.hpp>
+#include <scwx/common/products.hpp>
 
 #include <QMapLibreGL/QMapLibreGL>
 
@@ -10,9 +9,18 @@ namespace scwx
 {
 namespace qt
 {
+namespace view
+{
+
+class RadarProductView;
+
+} // namespace view
+
 namespace map
 {
 
+struct MapSettings;
+
 class MapContext : public gl::GlContext
 {
 public:
diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp
index 1e65f262..42ac39c5 100644
--- a/scwx-qt/source/scwx/qt/map/map_widget.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp
@@ -7,6 +7,7 @@
 #include <scwx/qt/map/color_table_layer.hpp>
 #include <scwx/qt/map/layer_wrapper.hpp>
 #include <scwx/qt/map/map_provider.hpp>
+#include <scwx/qt/map/map_settings.hpp>
 #include <scwx/qt/map/overlay_layer.hpp>
 #include <scwx/qt/map/overlay_product_layer.hpp>
 #include <scwx/qt/map/placefile_layer.hpp>
diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
index 8b18688f..6f23d8dd 100644
--- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
@@ -3,7 +3,9 @@
 #include <scwx/qt/gl/draw/icons.hpp>
 #include <scwx/qt/gl/draw/rectangle.hpp>
 #include <scwx/qt/manager/position_manager.hpp>
+#include <scwx/qt/map/map_settings.hpp>
 #include <scwx/qt/types/texture_types.hpp>
+#include <scwx/qt/view/radar_product_view.hpp>
 #include <scwx/util/logger.hpp>
 #include <scwx/util/time.hpp>
 
diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
index 0bae51bf..964ddf00 100644
--- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
@@ -2,6 +2,7 @@
 #include <scwx/qt/gl/shader_program.hpp>
 #include <scwx/qt/util/maplibre.hpp>
 #include <scwx/qt/util/tooltip.hpp>
+#include <scwx/qt/view/radar_product_view.hpp>
 #include <scwx/util/logger.hpp>
 
 #include <execution>