From 5bb6f8c5e3e5b41f32fbe3be84f31b3e6ca8cf73 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sun, 6 Jun 2021 19:11:35 -0400
Subject: [PATCH] hashtables.h doesn't need eda_item.h

---
 common/plugins/cadstar/cadstar_archive_parser.cpp | 1 +
 common/plugins/cadstar/cadstar_archive_parser.h   | 2 ++
 include/hashtables.h                              | 2 +-
 pcbnew/plugins/kicad/pcb_parser.h                 | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/plugins/cadstar/cadstar_archive_parser.cpp b/common/plugins/cadstar/cadstar_archive_parser.cpp
index 741e0e54b6..978af12fff 100644
--- a/common/plugins/cadstar/cadstar_archive_parser.cpp
+++ b/common/plugins/cadstar/cadstar_archive_parser.cpp
@@ -27,6 +27,7 @@
 #include <wx/xml/xml.h>
 
 #include <plugins/cadstar/cadstar_archive_parser.h>
+#include <eda_item.h>
 #include <eda_text.h>
 #include <macros.h>
 #include <trigo.h>
diff --git a/common/plugins/cadstar/cadstar_archive_parser.h b/common/plugins/cadstar/cadstar_archive_parser.h
index 544768bd03..3d6d872bb4 100644
--- a/common/plugins/cadstar/cadstar_archive_parser.h
+++ b/common/plugins/cadstar/cadstar_archive_parser.h
@@ -27,6 +27,8 @@
 #define CADSTAR_ARCHIVE_PARSER_H_
 
 #include <dsnlexer.h>
+#include <map>
+#include <set>
 #include <vector>
 #include <xnode.h>
 
diff --git a/include/hashtables.h b/include/hashtables.h
index 5b77cf5984..87d6ef3595 100644
--- a/include/hashtables.h
+++ b/include/hashtables.h
@@ -27,7 +27,7 @@
 
 #include <unordered_map>
 
-#include <eda_item.h>
+#include <eda_rect.h>
 #include <wx/string.h>
 
 // First some utility classes and functions
diff --git a/pcbnew/plugins/kicad/pcb_parser.h b/pcbnew/plugins/kicad/pcb_parser.h
index 19711f6699..dd6c1f933e 100644
--- a/pcbnew/plugins/kicad/pcb_parser.h
+++ b/pcbnew/plugins/kicad/pcb_parser.h
@@ -34,6 +34,7 @@
 #include <hashtables.h>
 #include <layers_id_colors_and_visibility.h>     // PCB_LAYER_ID
 #include <pcb_lexer.h>
+#include <kiid.h>
 
 #include <unordered_map>