From 35e129ed47ffc4c23e77e9b4276be9af823e3af2 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Thu, 1 Oct 2020 17:15:15 +0200
Subject: [PATCH] Minor code cleanup, step3: remove more useless include.

---
 common/search_stack.cpp           | 2 ++
 common/searchhelpfilefullpath.cpp | 1 +
 include/common.h                  | 4 +++-
 include/macros.h                  | 3 ++-
 include/property.h                | 2 +-
 include/status_popup.h            | 5 ++++-
 pcbnew/pcbnew.h                   | 1 -
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/common/search_stack.cpp b/common/search_stack.cpp
index 3cfa3c4eda..06235c79ad 100644
--- a/common/search_stack.cpp
+++ b/common/search_stack.cpp
@@ -26,6 +26,8 @@
 #include <search_stack.h>
 #include <trace_helpers.h>
 #include <wx/tokenzr.h>
+#include <wx/log.h>
+
 
 #if defined(__MINGW32__)
  #define PATH_SEPS          wxT( ";\r\n" )
diff --git a/common/searchhelpfilefullpath.cpp b/common/searchhelpfilefullpath.cpp
index 64636dbeff..e59b382962 100644
--- a/common/searchhelpfilefullpath.cpp
+++ b/common/searchhelpfilefullpath.cpp
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <config.h>     // to define DEFAULT_INSTALL_PATH
 #include <macros.h>
+#include <wx/log.h>
 #include <trace_helpers.h>
 
 
diff --git a/include/common.h b/include/common.h
index 053597e270..d7aec28e06 100644
--- a/include/common.h
+++ b/include/common.h
@@ -35,10 +35,12 @@
 #include <vector>
 #include <functional>
 
-#include <wx/wx.h>
 #include <wx/confbase.h>
 #include <wx/fileconf.h>
 #include <wx/dir.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/gdicmn.h>
 
 #include <richio.h>
 
diff --git a/include/macros.h b/include/macros.h
index ddb5611b2b..4f8e20bb7e 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -31,13 +31,14 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include <wx/wx.h>
 #include <deque>
 #include <vector>
 #include <map>
 #include <set>
 #include <memory>       // std::shared_ptr
 
+#include <wx/string.h>
+
 #if defined( __has_attribute )
     #define KI_HAS_ATTRIBUTE( x ) __has_attribute( x )
 #else
diff --git a/include/property.h b/include/property.h
index c51f1bb1da..df24e5e01f 100644
--- a/include/property.h
+++ b/include/property.h
@@ -22,9 +22,9 @@
 #ifndef PROPERTY_H
 #define PROPERTY_H
 
-#include <wx/wx.h>
 #include <wx/any.h>
 #include <wx/string.h>
+#include <wx/bitmap.h>
 #include <wx/propgrid/property.h>
 
 #include <functional>
diff --git a/include/status_popup.h b/include/status_popup.h
index 6a4e9cb2fa..835683a14b 100644
--- a/include/status_popup.h
+++ b/include/status_popup.h
@@ -26,9 +26,12 @@
 #define __STATUS_POPUP_H_
 
 
-#include <common.h>
 #include <math/vector2d.h>
 #include <wx/popupwin.h>
+#include <wx/timer.h>
+#include <wx/panel.h>
+#include <wx/stattext.h>
+#include <wx/sizer.h>
 
 class EDA_DRAW_FRAME;
 
diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h
index d336257460..c0eefa7adf 100644
--- a/pcbnew/pcbnew.h
+++ b/pcbnew/pcbnew.h
@@ -25,7 +25,6 @@
 #ifndef PCBNEW_H
 #define PCBNEW_H
 
-#include <fctsys.h>         // wxWidgets include.
 #include <convert_to_biu.h> // to define Mils2iu() conversion function
 
 // These are only here for algorithmic safety, not to tell the user what to do