Some header cleanup

common/widgets/unit_binder.cpp

@@ -28,6 +28,7 @@
 #include <wx/textentry.h>
 #include <limits>
 #include <base_units.h>
+#include <eda_units.h>
 #include <eda_draw_frame.h>
 #include <confirm.h>
 

include/board_item.h

@@ -27,8 +27,6 @@
 
 
 #include <eda_item.h>
-#include <eda_units.h>
-#include <gr_basic.h>
 #include <layer_ids.h>
 #include <geometry/geometry_utils.h>
 #include <stroke_params.h>

include/eda_item.h

@@ -34,7 +34,6 @@
 #include <eda_search_data.h>
 #include <view/view_item.h>
 #include <kiid.h>
-#include <units_provider.h>
 
 enum class BITMAPS : unsigned int;
 
@@ -49,20 +48,7 @@ enum class INSPECT_RESULT
 /**
  * Additional flag values wxFindReplaceData::m_Flags
  */
-enum FIND_REPLACE_FLAGS
+class UNITS_PROVIDER;
-{
-    // The last wxFindReplaceFlag enum is wxFR_MATCHCASE = 0x4.
-    FR_CURRENT_SHEET_ONLY = 0x4 << 1,   // Search the current sheet only.
-    FR_SEARCH_ALL_FIELDS  = 0x4 << 2,   // Search hidden fields too.
-    FR_SEARCH_ALL_PINS    = 0x4 << 3,   // Search pin name and number.
-    FR_MATCH_WILDCARD     = 0x4 << 4,   // Use simple wild card matching (* & ?).
-    FR_SEARCH_WRAP        = 0x4 << 5,   // Wrap around the start or end of search.
-    FR_SEARCH_REPLACE     = 0x4 << 7,   // Search for a item that has replaceable text.
-    FR_REPLACE_ITEM_FOUND = 0x4 << 8,   // Indicates an item with replaceable text has been found.
-    FR_REPLACE_REFERENCES = 0x4 << 9    // Don't replace in references.
-};
-
-class wxFindReplaceData;
 class EDA_DRAW_FRAME;
 class MSG_PANEL_ITEM;
 

include/eda_shape.h

@@ -25,7 +25,6 @@
 #ifndef EDA_SHAPE_H
 #define EDA_SHAPE_H
 
-#include <eda_units.h>
 #include <trigo.h>
 #include <geometry/shape_poly_set.h>
 #include <geometry/geometry_utils.h>

include/widgets/unit_binder.h

@@ -26,7 +26,6 @@
 #ifndef __UNIT_BINDER_H_
 #define __UNIT_BINDER_H_
 
-#include <eda_units.h>
 #include <base_units.h>
 #include <origin_transforms.h>
 #include <libeval/numeric_evaluator.h>

include/widgets/widget_save_restore.h

@@ -24,7 +24,7 @@
 #ifndef WIDGETS_WIDGET_SAVE_RESTORE__H
 #define WIDGETS_WIDGET_SAVE_RESTORE__H
 
-#include <eda_units.h>
+#include <base_units.h>
 #include <vector>
 
 class wxCheckBox;