From 46471247ff08e3069a6b2f99f0f02e89d9d6dcd8 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Tue, 27 Sep 2022 23:13:55 -0400
Subject: [PATCH] Some header cleanup

---
 common/widgets/unit_binder.cpp        |  1 +
 include/board_item.h                  |  2 --
 include/eda_item.h                    | 16 +---------------
 include/eda_shape.h                   |  1 -
 include/widgets/unit_binder.h         |  1 -
 include/widgets/widget_save_restore.h |  2 +-
 6 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/common/widgets/unit_binder.cpp b/common/widgets/unit_binder.cpp
index a1c6ce54d1..6fa4865ffd 100644
--- a/common/widgets/unit_binder.cpp
+++ b/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>
 
diff --git a/include/board_item.h b/include/board_item.h
index d35e199e38..65400865b0 100644
--- a/include/board_item.h
+++ b/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>
diff --git a/include/eda_item.h b/include/eda_item.h
index 3dc5109168..871fe8ce75 100644
--- a/include/eda_item.h
+++ b/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
-{
-    // 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 UNITS_PROVIDER;
 class EDA_DRAW_FRAME;
 class MSG_PANEL_ITEM;
 
diff --git a/include/eda_shape.h b/include/eda_shape.h
index 0bcca7746e..7f4f06fd7c 100644
--- a/include/eda_shape.h
+++ b/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>
diff --git a/include/widgets/unit_binder.h b/include/widgets/unit_binder.h
index 0fb03fa5df..259bfbe362 100644
--- a/include/widgets/unit_binder.h
+++ b/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>
diff --git a/include/widgets/widget_save_restore.h b/include/widgets/widget_save_restore.h
index 5bcee8be76..37d69788c2 100644
--- a/include/widgets/widget_save_restore.h
+++ b/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;