diff --git a/common/plugins/eagle/eagle_parser.h b/common/plugins/eagle/eagle_parser.h
index 3c12f9de3d..391cf5291b 100644
--- a/common/plugins/eagle/eagle_parser.h
+++ b/common/plugins/eagle/eagle_parser.h
@@ -40,7 +40,7 @@
 #include <convert_to_biu.h>
 #include <trigo.h>
 #include <kicad_string.h>
-#include <common.h>
+#include <common.h> // needed for wxString hash template
 
 class MODULE;
 struct EINSTANCE;
diff --git a/common/widgets/net_selector.cpp b/common/widgets/net_selector.cpp
index f77f42456f..49b6dec31f 100644
--- a/common/widgets/net_selector.cpp
+++ b/common/widgets/net_selector.cpp
@@ -267,9 +267,9 @@ public:
 protected:
     wxSize updateSize()
     {
-        int    listTop = m_listBox->GetRect().y;
+        int listTop    = m_listBox->GetRect().y;
         int itemHeight = KIUI::GetTextSize( wxT( "Xy" ), this ).y + LIST_ITEM_PADDING;
-        int    listHeight = m_listBox->GetCount() * itemHeight + LIST_PADDING;
+        int listHeight = m_listBox->GetCount() * itemHeight + LIST_PADDING;
 
         if( listTop + listHeight >= m_maxPopupHeight )
             listHeight = m_maxPopupHeight - listTop - 1;
diff --git a/eeschema/connection_graph.h b/eeschema/connection_graph.h
index b49462b5c4..519418b90c 100644
--- a/eeschema/connection_graph.h
+++ b/eeschema/connection_graph.h
@@ -24,7 +24,6 @@
 #include <mutex>
 #include <vector>
 
-#include <common.h>
 #include <erc_settings.h>
 #include <sch_connection.h>
 #include <sch_item.h>
diff --git a/gerbview/gbr_layout.h b/gerbview/gbr_layout.h
index 489ce34561..90f0f51bf5 100644
--- a/gerbview/gbr_layout.h
+++ b/gerbview/gbr_layout.h
@@ -32,7 +32,6 @@
 #define GBR_LAYOUT_H
 
 
-//#include <common.h>                         // PAGE_INFO
 #include <gerbview.h>                       // GERBER_DRAWLAYERS_COUNT
 #include <title_block.h>
 #include <gerber_draw_item.h>
diff --git a/include/base_screen.h b/include/base_screen.h
index 8dd8146a06..e88c935438 100644
--- a/include/base_screen.h
+++ b/include/base_screen.h
@@ -32,7 +32,6 @@
 #define  BASE_SCREEN_H
 
 #include <eda_item.h>
-#include <common.h>
 
 
 /**
diff --git a/include/class_board_item.h b/include/class_board_item.h
index 01b2cd414a..345c106ea4 100644
--- a/include/class_board_item.h
+++ b/include/class_board_item.h
@@ -32,7 +32,7 @@
 
 
 #include <eda_item.h>
-#include <common.h>
+#include <eda_units.h>
 #include <convert_to_biu.h>
 #include <gr_basic.h>
 #include <layers_id_colors_and_visibility.h>
diff --git a/include/preview_items/arc_geom_manager.h b/include/preview_items/arc_geom_manager.h
index ffdf800190..8a85896492 100644
--- a/include/preview_items/arc_geom_manager.h
+++ b/include/preview_items/arc_geom_manager.h
@@ -26,8 +26,6 @@
 
 #include <preview_items/multistep_geom_manager.h>
 
-#include <common.h>
-
 namespace KIGFX {
 namespace PREVIEW {
 
diff --git a/include/project/project_file.h b/include/project/project_file.h
index bfbd741885..ef2137e597 100644
--- a/include/project/project_file.h
+++ b/include/project/project_file.h
@@ -21,7 +21,7 @@
 #ifndef KICAD_PROJECT_FILE_H
 #define KICAD_PROJECT_FILE_H
 
-#include <common.h>
+#include <common.h> // needed for wxstring hash template
 #include <project/board_project_settings.h>
 #include <settings/json_settings.h>
 #include <settings/nested_settings.h>
diff --git a/include/property_mgr.h b/include/property_mgr.h
index be564dd960..b17b146aa0 100644
--- a/include/property_mgr.h
+++ b/include/property_mgr.h
@@ -31,8 +31,8 @@
 #include <memory>
 #include <eda_units.h>
 
-// Needed for stl hash extensions
-#include <common.h>
+
+#include <common.h> // Needed for stl hash extensions
 
 class PROPERTY_BASE;
 class TYPE_CAST_BASE;
diff --git a/include/tool/editor_conditions.h b/include/tool/editor_conditions.h
index c7ef080251..c3be088e7b 100644
--- a/include/tool/editor_conditions.h
+++ b/include/tool/editor_conditions.h
@@ -26,7 +26,6 @@
 #define EDITOR_CONDITIONS_H_
 
 #include <class_draw_panel_gal.h>
-#include <common.h>
 #include <functional>
 #include <tool/selection.h>
 #include <tool/selection_conditions.h>
diff --git a/include/widgets/color_swatch.h b/include/widgets/color_swatch.h
index f2b7135498..9372ad53ae 100644
--- a/include/widgets/color_swatch.h
+++ b/include/widgets/color_swatch.h
@@ -26,8 +26,6 @@
 
 #include <wx/wx.h>
 
-#include <common.h>
-
 #include <gal/color4d.h>
 
 
diff --git a/include/widgets/unit_binder.h b/include/widgets/unit_binder.h
index 412b4cf562..dee26ce95f 100644
--- a/include/widgets/unit_binder.h
+++ b/include/widgets/unit_binder.h
@@ -26,7 +26,7 @@
 #ifndef __UNIT_BINDER_H_
 #define __UNIT_BINDER_H_
 
-#include <common.h>
+#include <eda_units.h>
 #include <base_units.h>
 #include <eda_item.h>
 #include <origin_transforms.h>
diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h
index 7ef6e03a04..47b8f08ad0 100644
--- a/pcbnew/class_board.h
+++ b/pcbnew/class_board.h
@@ -29,7 +29,7 @@
 #include <board_item_container.h>
 #include <class_pcb_group.h>
 #include <class_module.h>
-#include <common.h> // PAGE_INFO
+#include <common.h> // Needed for stl hash extensions
 #include <layers_id_colors_and_visibility.h>
 #include <netinfo.h>
 #include <pcb_plot_params.h>
diff --git a/pcbnew/connectivity/from_to_cache.h b/pcbnew/connectivity/from_to_cache.h
index 7a5fc30a36..73674fac85 100644
--- a/pcbnew/connectivity/from_to_cache.h
+++ b/pcbnew/connectivity/from_to_cache.h
@@ -22,8 +22,6 @@
 
 #include <set>
 
-#include <common.h>
-
 class D_PAD;
 class BOARD_CONNECTED_ITEM;
 
diff --git a/pcbnew/drc/drc_length_report.h b/pcbnew/drc/drc_length_report.h
index 15307156b7..ee89580144 100644
--- a/pcbnew/drc/drc_length_report.h
+++ b/pcbnew/drc/drc_length_report.h
@@ -22,8 +22,6 @@
 
 #include <set>
 
-#include <common.h>
-
 class DRC_RULE;
 
 class DRC_LENGTH_REPORT
diff --git a/pcbnew/drc/drc_rule_condition.h b/pcbnew/drc/drc_rule_condition.h
index 1bd2acf6b6..faeb709d80 100644
--- a/pcbnew/drc/drc_rule_condition.h
+++ b/pcbnew/drc/drc_rule_condition.h
@@ -24,7 +24,6 @@
 #ifndef DRC_RULE_CONDITION_H
 #define DRC_RULE_CONDITION_H
 
-#include <common.h>
 #include <core/typeinfo.h>
 #include <layers_id_colors_and_visibility.h>
 
diff --git a/pcbnew/pcb_draw_panel_gal.h b/pcbnew/pcb_draw_panel_gal.h
index 50e737a44f..9f2a21c67c 100644
--- a/pcbnew/pcb_draw_panel_gal.h
+++ b/pcbnew/pcb_draw_panel_gal.h
@@ -28,7 +28,6 @@
 #include <class_draw_panel_gal.h>
 #include <layers_id_colors_and_visibility.h>
 #include <pcb_view.h>
-#include <common.h>
 
 namespace KIGFX
 {
diff --git a/pcbnew/pcb_shape.h b/pcbnew/pcb_shape.h
index c50f1ec803..65f1d1a704 100644
--- a/pcbnew/pcb_shape.h
+++ b/pcbnew/pcb_shape.h
@@ -26,7 +26,7 @@
 #define PCB_SHAPE_H
 
 #include <class_board_item.h>
-#include <common.h>
+#include <eda_units.h>
 #include <convert_to_biu.h>
 #include <math/util.h>      // for KiROUND
 #include <math_for_graphics.h>
diff --git a/qa/drc_proto/drc_proto.h b/qa/drc_proto/drc_proto.h
index 5a22232c6c..8117495d51 100644
--- a/qa/drc_proto/drc_proto.h
+++ b/qa/drc_proto/drc_proto.h
@@ -26,7 +26,6 @@
 
 #include <string>
 
-#include <common.h>
 #include <widgets/progress_reporter.h>
 #include <reporter.h>
 #include <core/optional.h>