From eeac3cb4d5796298f706a75534280c3084d796be Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sat, 24 Oct 2020 00:38:25 -0400
Subject: [PATCH] Nix some more common.h includes

---
 3d-viewer/3d_cache/3d_cache.cpp       |  1 -
 bitmap2component/bitmap2component.cpp |  1 -
 eeschema/sch_component.h              |  1 -
 include/hotkeys_basic.h               | 10 +++++-----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/3d-viewer/3d_cache/3d_cache.cpp b/3d-viewer/3d_cache/3d_cache.cpp
index f8247ad004..4dcaaeeff1 100644
--- a/3d-viewer/3d_cache/3d_cache.cpp
+++ b/3d-viewer/3d_cache/3d_cache.cpp
@@ -53,7 +53,6 @@
 #include "sg/scenegraph.h"
 #include "plugins/3dapi/ifsg_api.h"
 
-#include <common.h>
 #include <filename_resolver.h>
 #include <pgm_base.h>
 #include <project.h>
diff --git a/bitmap2component/bitmap2component.cpp b/bitmap2component/bitmap2component.cpp
index cd04248397..af61b8f879 100644
--- a/bitmap2component/bitmap2component.cpp
+++ b/bitmap2component/bitmap2component.cpp
@@ -31,7 +31,6 @@
 #include <string>
 #include <vector>
 
-#include <common.h>
 #include <layers_id_colors_and_visibility.h>
 
 #include <locale_io.h>
diff --git a/eeschema/sch_component.h b/eeschema/sch_component.h
index 6b4f695147..9124b1394e 100644
--- a/eeschema/sch_component.h
+++ b/eeschema/sch_component.h
@@ -28,7 +28,6 @@
 #define COMPONENT_CLASS_H
 
 #include <eda_item.h>
-#include <common.h>
 #include <core/typeinfo.h>
 #include <layers_id_colors_and_visibility.h>
 #include <lib_id.h>
diff --git a/include/hotkeys_basic.h b/include/hotkeys_basic.h
index fc4ea51406..abb98d5336 100644
--- a/include/hotkeys_basic.h
+++ b/include/hotkeys_basic.h
@@ -24,8 +24,8 @@
 #ifndef  HOTKEYS_BASIC_H
 #define  HOTKEYS_BASIC_H
 
+#include <wx/string.h>
 #include <map>
-#include <common.h>
 
 #define DEFAULT_HOTKEY_FILENAME_EXT wxT( "hotkeys" )
 #define EESCHEMA_HOTKEY_NAME wxT( "Eeschema" )
@@ -86,7 +86,7 @@ enum HOTKEY_ACTION_TYPE
  * @param aStyle - IS_HOTKEY to add <tab><keyname> (shortcuts in menus, same as hotkeys)
  *                 IS_COMMENT to add <spaces><(keyname)> mainly in tool tips
  */
-wxString AddHotkeyName(  const wxString& aText, int aHotKey, 
+wxString AddHotkeyName(  const wxString& aText, int aHotKey,
                          HOTKEY_ACTION_TYPE aStyle = IS_HOTKEY);
 
 /**
@@ -102,7 +102,7 @@ void DisplayHotkeyList( EDA_BASE_FRAME* aFrame, TOOL_MANAGER* aToolMgr );
  * Function ReadotKeyConfig
  * Reads a hotkey config file into a map.  If aFileName is empty it will read in the defualt
  * hotkeys file.
- * @param aHotKeys 
+ * @param aHotKeys
  */
 void ReadHotKeyConfig( wxString aFileName, std::map<std::string, int>& aHotKeys );
 
@@ -117,7 +117,7 @@ int WriteHotKeyConfig( const std::map<std::string, TOOL_ACTION*>& aActionMap );
  * Read hotkey configuration for a given app,
  * possibly before the frame for that app has been created
  * @param aFilename = the filename to save the hotkeys as
- * @param aMap The list of keycodes mapped by legacy property names 
+ * @param aMap The list of keycodes mapped by legacy property names
  * @return 1 on success, 0 on failure
 */
 int ReadLegacyHotkeyConfigFile( const wxString& aFilename, std::map<std::string, int>& aMap );
@@ -126,7 +126,7 @@ int ReadLegacyHotkeyConfigFile( const wxString& aFilename, std::map<std::string,
  * Function ReadLegacyHotkeyConfig
  * Read configuration data and fill the current hotkey list with hotkeys
  * @param aAppname = the value of the app's m_FrameName
- * @param aMap The list of keycodes mapped by legacy property names 
+ * @param aMap The list of keycodes mapped by legacy property names
  */
 int ReadLegacyHotkeyConfig( const wxString& aAppname, std::map<std::string, int>& aMap );