diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
index 4fb3015ed7..02cfaa71ea 100644
--- a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
+++ b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
@@ -24,7 +24,7 @@
 #ifndef CACHE_DIALOGS_3D_H
 #define CACHE_DIALOGS_3D_H
 
-#include <wx/wx.h>
+#include <wx/window.h>
 
 class S3D_CACHE;
 class S3D_FILENAME_RESOLVER;
diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.h b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.h
index 076df40b73..2d32088498 100644
--- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.h
+++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.h
@@ -30,7 +30,10 @@
 #ifndef DLG_SELECT_3DMODEL_H
 #define DLG_SELECT_3DMODEL_H
 
-#include <wx/wx.h>
+#include <wx/event.h>
+#include <wx/stattext.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
 #include <wx/dirctrl.h>
 #include <wx/sizer.h>
 #include <wx/frame.h>
diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.h b/3d-viewer/3d_cache/dialogs/panel_prev_model.h
index 36f44c6f9f..6c403c60d3 100644
--- a/3d-viewer/3d_cache/dialogs/panel_prev_model.h
+++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.h
@@ -34,8 +34,8 @@
 #ifndef PANEL_PREV_MODEL_H
 #define PANEL_PREV_MODEL_H
 
-#include <wx/wx.h>
 #include <wx/panel.h>
+#include <wx/textctrl.h>
 
 #include "plugins/3dapi/c3dmodel.h"
 #include "3d_cache/3d_info.h"