Dont leak richio into everything

common/lib_id.cpp

@@ -27,6 +27,7 @@
 #include <memory>
 #include <wx/translation.h>
 
+#include <ki_exception.h>
 #include <macros.h>     // TO_UTF8()
 #include <lib_id.h>
 

common/page_info.cpp

@@ -27,6 +27,7 @@
 #include <page_info.h>
 #include <macros.h>
 #include <eda_units.h>
+#include <richio.h>         // for OUTPUTFORMATTER and IO_ERROR
 
 
 // late arriving wxPAPER_A0, wxPAPER_A1

common/plugins/easyedapro/easyedapro_import_utils.cpp

@@ -24,6 +24,7 @@
 
 #include "easyedapro_import_utils.h"
 
+#include <ki_exception.h>
 #include <string_utils.h>
 #include <nlohmann/json.hpp>
 

common/plugins/easyedapro/easyedapro_import_utils.h

@@ -25,6 +25,7 @@
 #ifndef EASYEDAPRO_IMPORT_UTILS_H_
 #define EASYEDAPRO_IMPORT_UTILS_H_
 
+#include <wx/stream.h>
 #include <wx/string.h>
 #include <lib_id.h>
 #include <nlohmann/json_fwd.hpp>

eeschema/project_sch_specific.cpp

@@ -23,6 +23,7 @@
 #include <kiface_base.h>
 #include <pgm_base.h>
 #include <wx/app.h>
+#include <core/utf8.h>
 
 
 // non-member so it can be moved easily, and kept REALLY private.

eeschema/sch_io_mgr.h

@@ -23,13 +23,13 @@
 #ifndef _SCH_IO_MGR_H_
 #define _SCH_IO_MGR_H_
 
-#include <richio.h>
 #include <import_export.h>
 #include <map>
 #include <enum_vector.h>
 #include <reporter.h>
 #include <i18n_utility.h>
 #include <plugin_file_desc.h>
+#include <wx/arrstr.h>
 
 
 class SCH_SHEET;
@@ -121,7 +121,7 @@ public:
 
 /**
  * Base class that schematic file and library loading and saving plugins should derive from.
- * Implementations can provide either LoadSchematicFile() or SaveSchematicFile() functions, 
+ * Implementations can provide either LoadSchematicFile() or SaveSchematicFile() functions,
  * or both. SCH_PLUGINs throw exceptions, so it is best that you wrap your calls to these
  * functions in a try catch block.  Plugins throw exceptions because it is illegal
  * for them to have any user interface calls in them whatsoever, i.e. no windowing

eeschema/sch_plugin.cpp

@@ -23,6 +23,7 @@
 #include <string_utf8_map.h>
 #include <unordered_set>
 
+#include <ki_exception.h>
 #include <sch_io_mgr.h>
 #include <wx/translation.h>
 #include <wx/filename.h>

eeschema/sch_plugins/easyeda/sch_easyeda_plugin.h

@@ -27,6 +27,7 @@
 
 #include <sch_io_mgr.h>
 #include <reporter.h>
+#include <wx/arrstr.h>
 
 
 class SCH_SHEET;

eeschema/sch_plugins/kicad/sch_sexpr_plugin.h

@@ -29,6 +29,7 @@
 #include <sch_sheet_path.h>
 #include <stack>
 #include <wildcards_and_files_ext.h>
+#include <wx/string.h>
 
 
 class KIWAY;

eeschema/sch_plugins/legacy/sch_legacy_plugin.h

@@ -48,6 +48,7 @@ class SCH_LEGACY_PLUGIN_CACHE;
 class LIB_SYMBOL;
 class SYMBOL_LIB;
 class BUS_ALIAS;
+class OUTPUTFORMATTER;
 
 
 /**
@@ -141,7 +142,7 @@ public:
                           const STRING_UTF8_MAP* aProperties = nullptr ) override;
     void SaveLibrary( const wxString& aLibraryPath,
                       const STRING_UTF8_MAP* aProperties = nullptr ) override;
-    
+
     bool IsSymbolLibWritable( const wxString& aLibraryPath ) override;
 
     const wxString& GetError() const override { return m_error; }

gerbview/excellon_read_drill_file.cpp

@@ -72,6 +72,7 @@
 #include <excellon_image.h>
 #include <excellon_defaults.h>
 #include <macros.h>
+#include <richio.h>
 #include <string_utils.h>
 #include <locale_io.h>
 #include <X2_gerber_attributes.h>

gerbview/gerbview.cpp

@@ -34,6 +34,7 @@
 #include <macros.h>
 #include <nlohmann/json.hpp>
 #include <pgm_base.h>
+#include <richio.h>
 #include <settings/settings_manager.h>
 #include <dialogs/panel_gerbview_display_options.h>
 #include <dialogs/panel_gerbview_excellon_settings.h>

gerbview/readgerb.cpp

@@ -29,6 +29,7 @@
 #include <gerbview_frame.h>
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
+#include <richio.h>
 #include <view/view.h>
 
 #include <dialogs/html_message_box.h>

include/footprint_filter.h

@@ -23,6 +23,7 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <eda_pattern_match.h>
 #include <footprint_info.h>
+#include <wx/arrstr.h>
 
 
 /**

include/lib_id.h

@@ -26,7 +26,6 @@
 #ifndef _LIB_ID_H_
 #define _LIB_ID_H_
 
-#include <richio.h>
 #include <core/utf8.h>
 
 /**

include/page_info.h

@@ -33,13 +33,12 @@
 #include <wx/string.h>
 #include <math/vector2d.h>
 
-#include <richio.h>         // for OUTPUTFORMATTER and IO_ERROR
-
 /// Min and max page sizes for clamping, in mils.
 #define MIN_PAGE_SIZE_MILS          1000
 #define MAX_PAGE_SIZE_PCBNEW_MILS   48000
 #define MAX_PAGE_SIZE_EESCHEMA_MILS 120000
 
+class OUTPUTFORMATTER;
 
 /**
  * Describe the page size and margins of a paper page on which to eventually print or plot.

include/pcb_base_frame.h

@@ -36,7 +36,6 @@
 #include <pcb_draw_panel_gal.h>
 #include <pcb_origin_transforms.h>
 #include <pcb_screen.h>
-#include <richio.h>
 #include <vector>
 
 #include <wx/fswatcher.h>