5 files changed, 34 insertions, 6 deletions
diff --git a/lib/eventHandlerBase.cpp b/lib/eventHandlerBase.cpp
index 777c746..56fad53 100644
--- a/lib/eventHandlerBase.cpp
+++ b/lib/eventHandlerBase.cpp
@@ -1,5 +1,4 @@
 #include "eventHandlerBase.h"
-#include <type_traits>
 #include <utility>
 
 namespace MyGrate {
diff --git a/lib/output/dumpToConsole.cpp b/lib/output/dumpToConsole.cpp
index 4cc9cc9..81d9edc 100644
--- a/lib/output/dumpToConsole.cpp
+++ b/lib/output/dumpToConsole.cpp
@@ -1,7 +1,16 @@
 #include "dumpToConsole.h"
+#include "eventHandlerBase.h"
+#include "mariadb_repl.h"
+#include <algorithm>
 #include <compileTimeFormatter.h>
+#include <cstdint>
+#include <iostream>
+#include <map>
+#include <memory>
 #include <row.h>
 #include <streamSupport.h>
+#include <utility>
+#include <variant>
 
 namespace MyGrate::Output {
 	void
diff --git a/lib/output/dumpToConsole.h b/lib/output/dumpToConsole.h
index d03c795..e3d51b6 100644
--- a/lib/output/dumpToConsole.h
+++ b/lib/output/dumpToConsole.h
@@ -2,6 +2,7 @@
 #define MYGRATE_OUTPUT_DUMPTOCONSOLE_H
 
 #include <eventHandlerBase.h>
+struct st_mariadb_rpl_rows_event;
 
 namespace MyGrate::Output {
 	class DumpToConsole : public MyGrate::EventHandlerBase {
diff --git a/lib/streamSupport.cpp b/lib/streamSupport.cpp
index 1e5258c..acf6f7e 100644
--- a/lib/streamSupport.cpp
+++ b/lib/streamSupport.cpp
@@ -1,5 +1,12 @@
 #include "streamSupport.h"
+#include "bitset.h"
 #include "compileTimeFormatter.h"
+#include "mysql_types.h"
+#include <cstdint>
+#include <string_view>
+#include <type_traits>
+struct timespec;
+struct tm;
 
 namespace std {
 	std::ostream &
diff --git a/lib/streamSupport.h b/lib/streamSupport.h
index 0723faf..60e68d3 100644
--- a/lib/streamSupport.h
+++ b/lib/streamSupport.h
@@ -1,16 +1,28 @@
 #ifndef MYGRATE_STREAM_SUPPORT_H
 #define MYGRATE_STREAM_SUPPORT_H
 
+#include "mariadb_repl.h"
 #include <array>
 #include <cstddef>
-#include <iomanip>
-#include <mysql.h>
+#include <ctime>
 #include <ostream>
 #include <span>
+#include <utility>
 #include <vector>
-
-#include "mysql_types.h"
-#include <mariadb_rpl.h>
+namespace MyGrate {
+	class BitSet;
+}
+namespace MyGrate::MySQL {
+	struct Date;
+}
+namespace MyGrate::MySQL {
+	struct DateTime;
+}
+namespace MyGrate::MySQL {
+	struct Time;
+}
+struct timespec;
+struct tm;
 
 namespace std {
 	std::ostream & operator<<(std::ostream & strm, const std::byte byt);