From 7f3b3b7133b9fafb7109ebed5446041ee2588375 Mon Sep 17 00:00:00 2001
From: chainsawriot <chainsawtiney@gmail.com>
Date: Sun, 27 Aug 2023 11:02:59 +0200
Subject: [PATCH] improve header hygiene

---
 src/read_ods_internals.h |  3 +--
 src/splice.cpp           |  5 +----
 src/splice.h             | 12 ++++++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 src/splice.h

diff --git a/src/read_ods_internals.h b/src/read_ods_internals.h
index 221b522..c54675d 100644
--- a/src/read_ods_internals.h
+++ b/src/read_ods_internals.h
@@ -3,8 +3,7 @@
 #include "cpp11.hpp"
 #include "cpp11/r_string.hpp"
 
-// #include "rapidxml/rapidxml.hpp"
-#include "rapidxml/rapidxml_ext.hpp"
+#include "rapidxml/rapidxml.hpp"
 
 #include <vector>
 #include <string>
diff --git a/src/splice.cpp b/src/splice.cpp
index 1787263..762ec05 100644
--- a/src/splice.cpp
+++ b/src/splice.cpp
@@ -1,7 +1,4 @@
-#include "is_ods.h"
-#include "read_ods_internals.h"
-#include "write_sheet_.h"
-#include "rapidxml/rapidxml_utils.hpp"
+#include "splice.h"
 
 [[cpp11::register]]
 std::string splice_sheet(const std::string original_xml, const std::string sheet_xml, const bool flat) {
diff --git a/src/splice.h b/src/splice.h
new file mode 100644
index 0000000..2a4557c
--- /dev/null
+++ b/src/splice.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "cpp11.hpp"
+#include "cpp11/r_string.hpp"
+#include <fstream>
+#include <string>
+
+#include "rapidxml/rapidxml_ext.hpp"
+#include "rapidxml/rapidxml_utils.hpp"
+
+std::string splice_sheet_(const std::string original_xml, const std::string sheet_xml, const bool flat);
+std::string update_sheet_(const std::string original_xml, const std::string sheet_xml, const bool flat, const int sheet);