diff --git a/pcb_calculator/attenuators.cpp b/pcb_calculator/attenuators.cpp
index 69c594d1a7..06c2a70bfa 100644
--- a/pcb_calculator/attenuators.cpp
+++ b/pcb_calculator/attenuators.cpp
@@ -25,7 +25,6 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-#include <wx/wx.h>
 
 #include <dialog_helpers.h>
 
diff --git a/pcb_calculator/eserie.cpp b/pcb_calculator/eserie.cpp
index d896f2fec1..6aaa555f6a 100644
--- a/pcb_calculator/eserie.cpp
+++ b/pcb_calculator/eserie.cpp
@@ -27,7 +27,6 @@
 #include <dialog_helpers.h>
 #include "class_regulator_data.h"
 #include "pcb_calculator_frame.h"
-#include <wx/wx.h>
 
 #ifdef BENCHMARK
 #include <sys/time.h>
diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp
index c1c80d905e..fdafd75399 100644
--- a/pcb_calculator/pcb_calculator_frame.cpp
+++ b/pcb_calculator/pcb_calculator_frame.cpp
@@ -17,8 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <wx/wx.h>
-
+#include <wx/msgdlg.h>
 #include <bitmaps.h>
 #include <geometry/shape_poly_set.h>
 #include <kiface_i.h>
diff --git a/pcb_calculator/regulators_funct.cpp b/pcb_calculator/regulators_funct.cpp
index 59780b6e06..9a61a6ab8a 100644
--- a/pcb_calculator/regulators_funct.cpp
+++ b/pcb_calculator/regulators_funct.cpp
@@ -23,10 +23,13 @@
  * Contains the partial functions of PCB_CALCULATOR_FRAME related to regulators
  */
 
-#include <wx/wx.h>
 
 #include <macros.h>
 
+#include <wx/choicdlg.h>
+#include <wx/filedlg.h>
+#include <wx/msgdlg.h>
+
 #include "class_regulator_data.h"
 #include "pcb_calculator_frame.h"
 #include "pcb_calculator_settings.h"
diff --git a/pcb_calculator/tracks_width_versus_current.cpp b/pcb_calculator/tracks_width_versus_current.cpp
index 31aa5a246d..cbe439784a 100644
--- a/pcb_calculator/tracks_width_versus_current.cpp
+++ b/pcb_calculator/tracks_width_versus_current.cpp
@@ -26,7 +26,6 @@
 
 #include <cassert>
 #include <cmath>
-#include <wx/wx.h>
 #include <kiface_i.h>
 #include <dialog_helpers.h>
 
diff --git a/pcb_calculator/transline_dlg_funct.cpp b/pcb_calculator/transline_dlg_funct.cpp
index 57456e8afe..4eebc0a7de 100644
--- a/pcb_calculator/transline_dlg_funct.cpp
+++ b/pcb_calculator/transline_dlg_funct.cpp
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <wx/choicdlg.h>
 #include <wx/filename.h>
 #include <wx/settings.h>
-#include <wx/wx.h>
 
 #include <bitmaps.h>
 #include "common_data.h"
diff --git a/pcb_calculator/via.cpp b/pcb_calculator/via.cpp
index b984a31e56..4140d19278 100644
--- a/pcb_calculator/via.cpp
+++ b/pcb_calculator/via.cpp
@@ -43,7 +43,7 @@
  */
 
 #include <cmath>
-#include <wx/wx.h>
+#include <wx/choicdlg.h>
 
 #include <kiface_i.h>