summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2022-08-23 20:10:41 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2022-08-23 20:10:41 -0400
commit6ae2b11f86a6c3471d4061ab4ac4c69fa0d84199 (patch)
treefd47900d89f140c2f9dc89e5a6346bb3686855a0
parente11df5525aed8ecfa9cc28caaba7e4d07ed3b078 (diff)
downloadorcus-task/adjust-sorted-string-map.tar.gz
Remove ORCUS_ASCII and with it the global.hpp header file too task/adjust-sorted-string-mapbugfix/144-orcus-env-dump
-rw-r--r--include/orcus/Makefile.am1
-rw-r--r--include/orcus/css_parser.hpp1
-rw-r--r--include/orcus/global.hpp14
-rw-r--r--include/orcus/sax_ns_parser.hpp1
-rw-r--r--slickedit/cpp.vpj1
-rw-r--r--src/cli_global.cpp2
-rw-r--r--src/liborcus/common_test.cpp1
-rw-r--r--src/liborcus/css_document_tree_test.cpp1
-rw-r--r--src/liborcus/dom_tree.cpp1
-rw-r--r--src/liborcus/dom_tree_test.cpp1
-rw-r--r--src/liborcus/gnumeric_cell_context.cpp1
-rw-r--r--src/liborcus/gnumeric_context.cpp1
-rw-r--r--src/liborcus/gnumeric_sheet_context.cpp1
-rw-r--r--src/liborcus/interface.cpp1
-rw-r--r--src/liborcus/json_document_tree.cpp1
-rw-r--r--src/liborcus/json_document_tree_test.cpp1
-rw-r--r--src/liborcus/json_map_tree.cpp1
-rw-r--r--src/liborcus/json_structure_tree.cpp1
-rw-r--r--src/liborcus/measurement.cpp1
-rw-r--r--src/liborcus/odf_helper.cpp1
-rw-r--r--src/liborcus/odf_number_format_context.hpp1
-rw-r--r--src/liborcus/odf_styles_context.hpp2
-rw-r--r--src/liborcus/ods_content_xml_context.cpp1
-rw-r--r--src/liborcus/ooxml_types.cpp2
-rw-r--r--src/liborcus/opc_context.cpp1
-rw-r--r--src/liborcus/orcus_csv.cpp1
-rw-r--r--src/liborcus/orcus_import_ods.cpp1
-rw-r--r--src/liborcus/orcus_import_xlsx.cpp1
-rw-r--r--src/liborcus/orcus_json.cpp1
-rw-r--r--src/liborcus/orcus_xlsx.cpp1
-rw-r--r--src/liborcus/orcus_xml.cpp1
-rw-r--r--src/liborcus/spreadsheet_types.cpp1
-rw-r--r--src/liborcus/xlsx_conditional_format_context.cpp1
-rw-r--r--src/liborcus/xlsx_context.cpp1
-rw-r--r--src/liborcus/xlsx_revision_context.cpp1
-rw-r--r--src/liborcus/xlsx_sheet_context.cpp1
-rw-r--r--src/liborcus/xlsx_types.cpp2
-rw-r--r--src/liborcus/xlsx_workbook_context.cpp1
-rw-r--r--src/liborcus/xml_map_tree.cpp1
-rw-r--r--src/liborcus/xml_structure_tree.cpp1
-rw-r--r--src/liborcus/xml_structure_tree_test.cpp1
-rw-r--r--src/liborcus/yaml_document_tree.cpp1
-rw-r--r--src/liborcus/yaml_document_tree_test.cpp1
-rw-r--r--src/orcus_env_dump.cpp1
-rw-r--r--src/orcus_filter_global.cpp1
-rw-r--r--src/orcus_json_cli.cpp1
-rw-r--r--src/orcus_test_csv.cpp1
-rw-r--r--src/orcus_test_json_mapped.cpp1
-rw-r--r--src/orcus_test_ods.cpp1
-rw-r--r--src/orcus_test_xls_xml.cpp1
-rw-r--r--src/orcus_test_xlsx.cpp1
-rw-r--r--src/orcus_test_xml.cpp1
-rw-r--r--src/orcus_test_xml_mapped.cpp1
-rw-r--r--src/orcus_xml_main.cpp1
-rw-r--r--src/orcus_yaml_main.cpp1
-rw-r--r--src/parser/css_parser_base.cpp1
-rw-r--r--src/parser/css_types.cpp1
-rw-r--r--src/parser/csv_parser_base.cpp1
-rw-r--r--src/parser/json_parser_base.cpp1
-rw-r--r--src/parser/json_parser_thread.cpp1
-rw-r--r--src/parser/parser_base_test.cpp1
-rw-r--r--src/parser/parser_global.cpp1
-rw-r--r--src/parser/parser_test_numeric.cpp1
-rw-r--r--src/parser/sax_parser_base.cpp1
-rw-r--r--src/parser/sax_token_parser_test.cpp1
-rw-r--r--src/parser/sax_token_parser_thread.cpp1
-rw-r--r--src/parser/stream.cpp1
-rw-r--r--src/parser/string_pool.cpp1
-rw-r--r--src/parser/string_pool_test.cpp1
-rw-r--r--src/parser/threaded_json_parser_test.cpp1
-rw-r--r--src/parser/threaded_sax_token_parser_test.cpp1
-rw-r--r--src/parser/types.cpp1
-rw-r--r--src/parser/xml_namespace.cpp1
-rw-r--r--src/parser/xml_writer.cpp17
-rw-r--r--src/parser/yaml_parser_base.cpp1
-rw-r--r--src/python/csv.cpp1
-rw-r--r--src/python/formula_token.cpp1
-rw-r--r--src/python/gnumeric.cpp1
-rw-r--r--src/python/ods.cpp1
-rw-r--r--src/python/xls_xml.cpp1
-rw-r--r--src/python/xlsx.cpp1
-rw-r--r--src/spreadsheet/document_impl.hpp1
-rw-r--r--src/spreadsheet/factory.cpp1
-rw-r--r--src/spreadsheet/factory_pivot.cpp1
-rw-r--r--src/spreadsheet/factory_sheet.cpp1
-rw-r--r--src/spreadsheet/factory_styles.cpp1
-rw-r--r--src/spreadsheet/factory_table.cpp1
-rw-r--r--src/spreadsheet/global_settings.cpp1
-rw-r--r--src/spreadsheet/html_dumper.cpp1
-rw-r--r--src/spreadsheet/pivot.cpp1
-rw-r--r--src/spreadsheet/shared_strings.cpp1
-rw-r--r--src/spreadsheet/styles.cpp1
-rw-r--r--src/spreadsheet/view.cpp1
93 files changed, 11 insertions, 115 deletions
diff --git a/include/orcus/Makefile.am b/include/orcus/Makefile.am
index d87dc6d1..fecbf0eb 100644
--- a/include/orcus/Makefile.am
+++ b/include/orcus/Makefile.am
@@ -16,7 +16,6 @@ liborcus_HEADERS = \
env.hpp \
exception.hpp \
format_detection.hpp \
- global.hpp \
info.hpp \
interface.hpp \
json_document_tree.hpp \
diff --git a/include/orcus/css_parser.hpp b/include/orcus/css_parser.hpp
index 148c58c2..53a5aadc 100644
--- a/include/orcus/css_parser.hpp
+++ b/include/orcus/css_parser.hpp
@@ -12,7 +12,6 @@
#include "parser_global.hpp"
#include "css_parser_base.hpp"
-#include "global.hpp"
#include <cassert>
#include <algorithm>
diff --git a/include/orcus/global.hpp b/include/orcus/global.hpp
deleted file mode 100644
index ca77fe51..00000000
--- a/include/orcus/global.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_ORCUS_GLOBAL_HPP
-#define INCLUDED_ORCUS_GLOBAL_HPP
-
-#define ORCUS_ASCII(literal) literal, sizeof(literal)-1
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/orcus/sax_ns_parser.hpp b/include/orcus/sax_ns_parser.hpp
index fe54a67b..5bd62836 100644
--- a/include/orcus/sax_ns_parser.hpp
+++ b/include/orcus/sax_ns_parser.hpp
@@ -10,7 +10,6 @@
#include "sax_parser.hpp"
#include "xml_namespace.hpp"
-#include "global.hpp"
#include <unordered_set>
#include <vector>
diff --git a/slickedit/cpp.vpj b/slickedit/cpp.vpj
index 6f983c1d..cab9afca 100644
--- a/slickedit/cpp.vpj
+++ b/slickedit/cpp.vpj
@@ -201,7 +201,6 @@
<F N="../include/orcus/env.hpp"/>
<F N="../include/orcus/exception.hpp"/>
<F N="../include/orcus/format_detection.hpp"/>
- <F N="../include/orcus/global.hpp"/>
<F N="../include/orcus/info.hpp"/>
<F N="../include/orcus/interface.hpp"/>
<F N="../include/orcus/json_document_tree.hpp"/>
diff --git a/src/cli_global.cpp b/src/cli_global.cpp
index 9ac7ac65..aa3455de 100644
--- a/src/cli_global.cpp
+++ b/src/cli_global.cpp
@@ -7,8 +7,6 @@
#include "cli_global.hpp"
-#include "orcus/global.hpp"
-
#include <iostream>
#include <fstream>
diff --git a/src/liborcus/common_test.cpp b/src/liborcus/common_test.cpp
index ef32c83a..8e4f4c79 100644
--- a/src/liborcus/common_test.cpp
+++ b/src/liborcus/common_test.cpp
@@ -5,7 +5,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <orcus/global.hpp>
#include <orcus/measurement.hpp>
#include <orcus/spreadsheet/types.hpp>
diff --git a/src/liborcus/css_document_tree_test.cpp b/src/liborcus/css_document_tree_test.cpp
index 3c5c084e..ca164acf 100644
--- a/src/liborcus/css_document_tree_test.cpp
+++ b/src/liborcus/css_document_tree_test.cpp
@@ -9,7 +9,6 @@
#include <orcus/css_types.hpp>
#include <orcus/css_parser_base.hpp>
#include <orcus/stream.hpp>
-#include <orcus/global.hpp>
#include <cstdlib>
#include <cassert>
diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp
index 64ecf8ef..f8414437 100644
--- a/src/liborcus/dom_tree.cpp
+++ b/src/liborcus/dom_tree.cpp
@@ -8,7 +8,6 @@
#include <orcus/dom_tree.hpp>
#include <orcus/exception.hpp>
#include <orcus/xml_namespace.hpp>
-#include <orcus/global.hpp>
#include <orcus/sax_ns_parser.hpp>
#include <orcus/string_pool.hpp>
#include "pstring.hpp"
diff --git a/src/liborcus/dom_tree_test.cpp b/src/liborcus/dom_tree_test.cpp
index 40f719f5..2d77abbd 100644
--- a/src/liborcus/dom_tree_test.cpp
+++ b/src/liborcus/dom_tree_test.cpp
@@ -3,7 +3,6 @@
#include <orcus/stream.hpp>
#include <orcus/xml_namespace.hpp>
#include "pstring.hpp"
-#include <orcus/global.hpp>
#include <cassert>
#include <iostream>
diff --git a/src/liborcus/gnumeric_cell_context.cpp b/src/liborcus/gnumeric_cell_context.cpp
index c0812919..8384acce 100644
--- a/src/liborcus/gnumeric_cell_context.cpp
+++ b/src/liborcus/gnumeric_cell_context.cpp
@@ -8,7 +8,6 @@
#include "gnumeric_token_constants.hpp"
#include "gnumeric_namespace_types.hpp"
#include "gnumeric_cell_context.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include <iostream>
diff --git a/src/liborcus/gnumeric_context.cpp b/src/liborcus/gnumeric_context.cpp
index 18c60788..47c58db1 100644
--- a/src/liborcus/gnumeric_context.cpp
+++ b/src/liborcus/gnumeric_context.cpp
@@ -9,7 +9,6 @@
#include "gnumeric_token_constants.hpp"
#include "gnumeric_namespace_types.hpp"
#include "gnumeric_sheet_context.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include <iostream>
diff --git a/src/liborcus/gnumeric_sheet_context.cpp b/src/liborcus/gnumeric_sheet_context.cpp
index cbe4147a..271b466b 100644
--- a/src/liborcus/gnumeric_sheet_context.cpp
+++ b/src/liborcus/gnumeric_sheet_context.cpp
@@ -12,7 +12,6 @@
#include "gnumeric_helper.hpp"
#include "impl_utils.hpp"
-#include <orcus/global.hpp>
#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/spreadsheet/import_interface_styles.hpp>
diff --git a/src/liborcus/interface.cpp b/src/liborcus/interface.cpp
index cd50caca..f61df5b6 100644
--- a/src/liborcus/interface.cpp
+++ b/src/liborcus/interface.cpp
@@ -7,7 +7,6 @@
#include "orcus/interface.hpp"
#include "orcus/config.hpp"
-#include "orcus/global.hpp"
namespace orcus { namespace iface {
diff --git a/src/liborcus/json_document_tree.cpp b/src/liborcus/json_document_tree.cpp
index 98ac123c..e23521ea 100644
--- a/src/liborcus/json_document_tree.cpp
+++ b/src/liborcus/json_document_tree.cpp
@@ -7,7 +7,6 @@
#include <orcus/json_document_tree.hpp>
#include <orcus/json_parser.hpp>
-#include <orcus/global.hpp>
#include <orcus/config.hpp>
#include <orcus/stream.hpp>
#include <orcus/string_pool.hpp>
diff --git a/src/liborcus/json_document_tree_test.cpp b/src/liborcus/json_document_tree_test.cpp
index d2cafe35..b4e430dc 100644
--- a/src/liborcus/json_document_tree_test.cpp
+++ b/src/liborcus/json_document_tree_test.cpp
@@ -10,7 +10,6 @@
#include <orcus/stream.hpp>
#include <orcus/json_document_tree.hpp>
#include <orcus/json_parser_base.hpp>
-#include <orcus/global.hpp>
#include <orcus/config.hpp>
#include <orcus/xml_namespace.hpp>
#include <orcus/dom_tree.hpp>
diff --git a/src/liborcus/json_map_tree.cpp b/src/liborcus/json_map_tree.cpp
index 2b092a52..0b9916ca 100644
--- a/src/liborcus/json_map_tree.cpp
+++ b/src/liborcus/json_map_tree.cpp
@@ -6,7 +6,6 @@
*/
#include "json_map_tree.hpp"
-#include "orcus/global.hpp"
#include "orcus/measurement.hpp"
#include <iostream>
diff --git a/src/liborcus/json_structure_tree.cpp b/src/liborcus/json_structure_tree.cpp
index 3ae8ecc0..8f03a6fa 100644
--- a/src/liborcus/json_structure_tree.cpp
+++ b/src/liborcus/json_structure_tree.cpp
@@ -7,7 +7,6 @@
#include <orcus/json_structure_tree.hpp>
#include <orcus/json_parser.hpp>
-#include <orcus/global.hpp>
#include <orcus/string_pool.hpp>
#include "pstring.hpp"
diff --git a/src/liborcus/measurement.cpp b/src/liborcus/measurement.cpp
index f0306ffe..cc7f1b62 100644
--- a/src/liborcus/measurement.cpp
+++ b/src/liborcus/measurement.cpp
@@ -11,7 +11,6 @@
#include <mdds/sorted_string_map.hpp>
#include <mdds/global.hpp>
-#include <orcus/global.hpp>
#include <sstream>
diff --git a/src/liborcus/odf_helper.cpp b/src/liborcus/odf_helper.cpp
index 5d36fa5b..ab4d0a10 100644
--- a/src/liborcus/odf_helper.cpp
+++ b/src/liborcus/odf_helper.cpp
@@ -11,7 +11,6 @@
#include <orcus/measurement.hpp>
#include <mdds/sorted_string_map.hpp>
#include <mdds/global.hpp>
-#include <orcus/global.hpp>
#include <orcus/spreadsheet/styles.hpp>
namespace ss = orcus::spreadsheet;
diff --git a/src/liborcus/odf_number_format_context.hpp b/src/liborcus/odf_number_format_context.hpp
index a0efbce8..5831923b 100644
--- a/src/liborcus/odf_number_format_context.hpp
+++ b/src/liborcus/odf_number_format_context.hpp
@@ -11,7 +11,6 @@
#include "xml_context_base.hpp"
#include "odf_styles.hpp"
-#include "orcus/global.hpp"
#include "orcus/string_pool.hpp"
namespace orcus {
diff --git a/src/liborcus/odf_styles_context.hpp b/src/liborcus/odf_styles_context.hpp
index 09ea2b28..52f86145 100644
--- a/src/liborcus/odf_styles_context.hpp
+++ b/src/liborcus/odf_styles_context.hpp
@@ -12,8 +12,6 @@
#include "odf_styles.hpp"
#include "odf_number_format_context.hpp"
-#include <orcus/global.hpp>
-
#include <unordered_map>
namespace orcus {
diff --git a/src/liborcus/ods_content_xml_context.cpp b/src/liborcus/ods_content_xml_context.cpp
index 0bc25008..d5cbde56 100644
--- a/src/liborcus/ods_content_xml_context.cpp
+++ b/src/liborcus/ods_content_xml_context.cpp
@@ -12,7 +12,6 @@
#include "session_context.hpp"
#include "ods_session_data.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include <iostream>
diff --git a/src/liborcus/ooxml_types.cpp b/src/liborcus/ooxml_types.cpp
index 36103f68..e9a76407 100644
--- a/src/liborcus/ooxml_types.cpp
+++ b/src/liborcus/ooxml_types.cpp
@@ -7,8 +7,6 @@
#include "ooxml_types.hpp"
-#include "orcus/global.hpp"
-
namespace orcus {
opc_rel_extra::~opc_rel_extra() {}
diff --git a/src/liborcus/opc_context.cpp b/src/liborcus/opc_context.cpp
index 618ee022..c386ef5a 100644
--- a/src/liborcus/opc_context.cpp
+++ b/src/liborcus/opc_context.cpp
@@ -13,7 +13,6 @@
#include "session_context.hpp"
#include "orcus/exception.hpp"
-#include "orcus/global.hpp"
#include <cassert>
#include <iostream>
diff --git a/src/liborcus/orcus_csv.cpp b/src/liborcus/orcus_csv.cpp
index 5c71bcf5..0cfdb41f 100644
--- a/src/liborcus/orcus_csv.cpp
+++ b/src/liborcus/orcus_csv.cpp
@@ -9,7 +9,6 @@
#include "orcus/csv_parser.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "orcus/stream.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include "orcus/config.hpp"
diff --git a/src/liborcus/orcus_import_ods.cpp b/src/liborcus/orcus_import_ods.cpp
index 651e60f6..9d1880c1 100644
--- a/src/liborcus/orcus_import_ods.cpp
+++ b/src/liborcus/orcus_import_ods.cpp
@@ -8,7 +8,6 @@
#include "orcus/orcus_import_ods.hpp"
#include "orcus/xml_namespace.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include "orcus/config.hpp"
diff --git a/src/liborcus/orcus_import_xlsx.cpp b/src/liborcus/orcus_import_xlsx.cpp
index 27ffa161..daa1aa8f 100644
--- a/src/liborcus/orcus_import_xlsx.cpp
+++ b/src/liborcus/orcus_import_xlsx.cpp
@@ -8,7 +8,6 @@
#include "orcus/orcus_import_xlsx.hpp"
#include "orcus/xml_namespace.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include "orcus/config.hpp"
diff --git a/src/liborcus/orcus_json.cpp b/src/liborcus/orcus_json.cpp
index 69672190..48a2d563 100644
--- a/src/liborcus/orcus_json.cpp
+++ b/src/liborcus/orcus_json.cpp
@@ -10,7 +10,6 @@
#include <orcus/json_structure_tree.hpp>
#include <orcus/config.hpp>
#include <orcus/spreadsheet/import_interface.hpp>
-#include <orcus/global.hpp>
#include <orcus/json_parser.hpp>
#include <orcus/stream.hpp>
diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
index bdb076a4..4a9b467d 100644
--- a/src/liborcus/orcus_xlsx.cpp
+++ b/src/liborcus/orcus_xlsx.cpp
@@ -8,7 +8,6 @@
#include "orcus/orcus_xlsx.hpp"
#include "orcus/xml_namespace.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include "orcus/exception.hpp"
#include "orcus/config.hpp"
diff --git a/src/liborcus/orcus_xml.cpp b/src/liborcus/orcus_xml.cpp
index b04c9278..c5dcf84a 100644
--- a/src/liborcus/orcus_xml.cpp
+++ b/src/liborcus/orcus_xml.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/orcus_xml.hpp>
-#include <orcus/global.hpp>
#include <orcus/sax_ns_parser.hpp>
#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/spreadsheet/export_interface.hpp>
diff --git a/src/liborcus/spreadsheet_types.cpp b/src/liborcus/spreadsheet_types.cpp
index faae1836..cb135345 100644
--- a/src/liborcus/spreadsheet_types.cpp
+++ b/src/liborcus/spreadsheet_types.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/spreadsheet/types.hpp>
-#include <orcus/global.hpp>
#include <orcus/exception.hpp>
#include "pstring.hpp"
diff --git a/src/liborcus/xlsx_conditional_format_context.cpp b/src/liborcus/xlsx_conditional_format_context.cpp
index b5834fbf..21375c7b 100644
--- a/src/liborcus/xlsx_conditional_format_context.cpp
+++ b/src/liborcus/xlsx_conditional_format_context.cpp
@@ -11,7 +11,6 @@
#include "ooxml_token_constants.hpp"
#include "ooxml_namespace_types.hpp"
-#include "orcus/global.hpp"
#include "orcus/exception.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include "orcus/measurement.hpp"
diff --git a/src/liborcus/xlsx_context.cpp b/src/liborcus/xlsx_context.cpp
index a824378e..ff5b4a90 100644
--- a/src/liborcus/xlsx_context.cpp
+++ b/src/liborcus/xlsx_context.cpp
@@ -15,7 +15,6 @@
#include "xml_context_global.hpp"
#include "impl_utils.hpp"
-#include <orcus/global.hpp>
#include <orcus/tokens.hpp>
#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/spreadsheet/import_interface_styles.hpp>
diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
index 4a3bfb1b..2409d813 100644
--- a/src/liborcus/xlsx_revision_context.cpp
+++ b/src/liborcus/xlsx_revision_context.cpp
@@ -13,7 +13,6 @@
#include "orcus/measurement.hpp"
#include "orcus/string_pool.hpp"
-#include "orcus/global.hpp"
#include <iostream>
#include <limits>
diff --git a/src/liborcus/xlsx_sheet_context.cpp b/src/liborcus/xlsx_sheet_context.cpp
index 237da039..41ca1260 100644
--- a/src/liborcus/xlsx_sheet_context.cpp
+++ b/src/liborcus/xlsx_sheet_context.cpp
@@ -16,7 +16,6 @@
#include "ooxml_namespace_types.hpp"
#include "xml_context_global.hpp"
#include "orcus/exception.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
#include "orcus/spreadsheet/import_interface_view.hpp"
#include "orcus/measurement.hpp"
diff --git a/src/liborcus/xlsx_types.cpp b/src/liborcus/xlsx_types.cpp
index 7d4d7ccd..3c0ba2a2 100644
--- a/src/liborcus/xlsx_types.cpp
+++ b/src/liborcus/xlsx_types.cpp
@@ -7,8 +7,6 @@
#include "xlsx_types.hpp"
-#include "orcus/global.hpp"
-
#include <mdds/sorted_string_map.hpp>
namespace orcus {
diff --git a/src/liborcus/xlsx_workbook_context.cpp b/src/liborcus/xlsx_workbook_context.cpp
index 2c1bd685..8493280c 100644
--- a/src/liborcus/xlsx_workbook_context.cpp
+++ b/src/liborcus/xlsx_workbook_context.cpp
@@ -13,7 +13,6 @@
#include "session_context.hpp"
#include "xlsx_session_data.hpp"
-#include "orcus/global.hpp"
#include "orcus/measurement.hpp"
#include "orcus/spreadsheet/import_interface.hpp"
diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp
index aff884d2..f9546acd 100644
--- a/src/liborcus/xml_map_tree.cpp
+++ b/src/liborcus/xml_map_tree.cpp
@@ -7,7 +7,6 @@
#include "xml_map_tree.hpp"
#include "xpath_parser.hpp"
-#include "orcus/global.hpp"
#define ORCUS_DEBUG_XML_MAP_TREE 0
diff --git a/src/liborcus/xml_structure_tree.cpp b/src/liborcus/xml_structure_tree.cpp
index 854ff7ea..037fd55b 100644
--- a/src/liborcus/xml_structure_tree.cpp
+++ b/src/liborcus/xml_structure_tree.cpp
@@ -8,7 +8,6 @@
#include <orcus/xml_structure_tree.hpp>
#include <orcus/sax_ns_parser.hpp>
#include <orcus/xml_namespace.hpp>
-#include <orcus/global.hpp>
#include <orcus/exception.hpp>
#include <orcus/string_pool.hpp>
diff --git a/src/liborcus/xml_structure_tree_test.cpp b/src/liborcus/xml_structure_tree_test.cpp
index ed2f2c12..3942d85d 100644
--- a/src/liborcus/xml_structure_tree_test.cpp
+++ b/src/liborcus/xml_structure_tree_test.cpp
@@ -7,7 +7,6 @@
#include <orcus/xml_structure_tree.hpp>
#include <orcus/xml_namespace.hpp>
-#include <orcus/global.hpp>
#include <orcus/stream.hpp>
#include <orcus/parser_global.hpp>
diff --git a/src/liborcus/yaml_document_tree.cpp b/src/liborcus/yaml_document_tree.cpp
index 0b3685d7..7a580483 100644
--- a/src/liborcus/yaml_document_tree.cpp
+++ b/src/liborcus/yaml_document_tree.cpp
@@ -8,7 +8,6 @@
#include "orcus/yaml_document_tree.hpp"
#include "orcus/yaml_parser.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "json_util.hpp"
diff --git a/src/liborcus/yaml_document_tree_test.cpp b/src/liborcus/yaml_document_tree_test.cpp
index 3992fd4b..b4e68d9d 100644
--- a/src/liborcus/yaml_document_tree_test.cpp
+++ b/src/liborcus/yaml_document_tree_test.cpp
@@ -8,7 +8,6 @@
#include "orcus/yaml_document_tree.hpp"
#include "orcus/stream.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "orcus/yaml_parser_base.hpp"
#include <cassert>
diff --git a/src/orcus_env_dump.cpp b/src/orcus_env_dump.cpp
index 99f53718..2a60fb7d 100644
--- a/src/orcus_env_dump.cpp
+++ b/src/orcus_env_dump.cpp
@@ -5,7 +5,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "orcus/global.hpp"
#include "cpu_features.hpp"
#include <iostream>
diff --git a/src/orcus_filter_global.cpp b/src/orcus_filter_global.cpp
index 17ac531b..fa6ce44f 100644
--- a/src/orcus_filter_global.cpp
+++ b/src/orcus_filter_global.cpp
@@ -8,7 +8,6 @@
#include "orcus_filter_global.hpp"
#include "orcus/config.hpp"
#include "orcus/interface.hpp"
-#include "orcus/global.hpp"
#include "orcus/spreadsheet/factory.hpp"
#include <mdds/sorted_string_map.hpp>
diff --git a/src/orcus_json_cli.cpp b/src/orcus_json_cli.cpp
index cda23fc8..ca6f682f 100644
--- a/src/orcus_json_cli.cpp
+++ b/src/orcus_json_cli.cpp
@@ -13,7 +13,6 @@
#include "orcus/stream.hpp"
#include "orcus/xml_namespace.hpp"
#include "orcus/dom_tree.hpp"
-#include "orcus/global.hpp"
#include <iostream>
#include <fstream>
diff --git a/src/orcus_test_csv.cpp b/src/orcus_test_csv.cpp
index 310ace9d..fd7f5e94 100644
--- a/src/orcus_test_csv.cpp
+++ b/src/orcus_test_csv.cpp
@@ -9,7 +9,6 @@
#include "orcus/orcus_csv.hpp"
#include "orcus/config.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "orcus/stream.hpp"
#include "orcus/spreadsheet/factory.hpp"
#include "orcus/spreadsheet/document.hpp"
diff --git a/src/orcus_test_json_mapped.cpp b/src/orcus_test_json_mapped.cpp
index c504e156..bdd665c0 100644
--- a/src/orcus_test_json_mapped.cpp
+++ b/src/orcus_test_json_mapped.cpp
@@ -10,7 +10,6 @@
#include <orcus/spreadsheet/document.hpp>
#include <orcus/spreadsheet/factory.hpp>
#include <orcus/exception.hpp>
-#include <orcus/global.hpp>
#include <orcus/parser_global.hpp>
#include <iostream>
diff --git a/src/orcus_test_ods.cpp b/src/orcus_test_ods.cpp
index 5bea6ef7..53df457f 100644
--- a/src/orcus_test_ods.cpp
+++ b/src/orcus_test_ods.cpp
@@ -7,7 +7,6 @@
#include "orcus/orcus_ods.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "orcus/stream.hpp"
#include "orcus/spreadsheet/factory.hpp"
#include "orcus/spreadsheet/document.hpp"
diff --git a/src/orcus_test_xls_xml.cpp b/src/orcus_test_xls_xml.cpp
index c8b18859..39818b53 100644
--- a/src/orcus_test_xls_xml.cpp
+++ b/src/orcus_test_xls_xml.cpp
@@ -8,7 +8,6 @@
#include "orcus_test_global.hpp"
#include "orcus/orcus_xls_xml.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "orcus/stream.hpp"
#include "orcus/config.hpp"
#include "orcus/yaml_document_tree.hpp"
diff --git a/src/orcus_test_xlsx.cpp b/src/orcus_test_xlsx.cpp
index 436baea7..32a81639 100644
--- a/src/orcus_test_xlsx.cpp
+++ b/src/orcus_test_xlsx.cpp
@@ -7,7 +7,6 @@
#include "orcus/orcus_xlsx.hpp"
#include "pstring.hpp"
-#include "orcus/global.hpp"
#include "orcus/stream.hpp"
#include "orcus/config.hpp"
#include "orcus/spreadsheet/factory.hpp"
diff --git a/src/orcus_test_xml.cpp b/src/orcus_test_xml.cpp
index de5197cf..5def53fb 100644
--- a/src/orcus_test_xml.cpp
+++ b/src/orcus_test_xml.cpp
@@ -6,7 +6,6 @@
*/
#include "orcus/sax_ns_parser.hpp"
-#include "orcus/global.hpp"
#include "orcus/dom_tree.hpp"
#include "orcus/xml_namespace.hpp"
#include "orcus/stream.hpp"
diff --git a/src/orcus_test_xml_mapped.cpp b/src/orcus_test_xml_mapped.cpp
index 8e18cfda..14a8295a 100644
--- a/src/orcus_test_xml_mapped.cpp
+++ b/src/orcus_test_xml_mapped.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/orcus_xml.hpp>
-#include <orcus/global.hpp>
#include <orcus/sax_ns_parser.hpp>
#include <orcus/xml_namespace.hpp>
#include <orcus/stream.hpp>
diff --git a/src/orcus_xml_main.cpp b/src/orcus_xml_main.cpp
index f977ae1b..4056939f 100644
--- a/src/orcus_xml_main.cpp
+++ b/src/orcus_xml_main.cpp
@@ -12,7 +12,6 @@
#include "orcus/spreadsheet/factory.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/stream.hpp"
-#include "orcus/global.hpp"
#include "orcus/sax_parser_base.hpp"
#include "orcus_filter_global.hpp"
diff --git a/src/orcus_yaml_main.cpp b/src/orcus_yaml_main.cpp
index 12478b57..9f750dd4 100644
--- a/src/orcus_yaml_main.cpp
+++ b/src/orcus_yaml_main.cpp
@@ -9,7 +9,6 @@
#include "orcus/yaml_parser_base.hpp"
#include "orcus/config.hpp"
#include "orcus/stream.hpp"
-#include "orcus/global.hpp"
#include <iostream>
#include <fstream>
diff --git a/src/parser/css_parser_base.cpp b/src/parser/css_parser_base.cpp
index 617d5236..34f7d6ef 100644
--- a/src/parser/css_parser_base.cpp
+++ b/src/parser/css_parser_base.cpp
@@ -7,7 +7,6 @@
#include <orcus/css_parser_base.hpp>
#include <orcus/parser_global.hpp>
-#include <orcus/global.hpp>
#include "utf8.hpp"
diff --git a/src/parser/css_types.cpp b/src/parser/css_types.cpp
index 7c0eae24..b1289d92 100644
--- a/src/parser/css_types.cpp
+++ b/src/parser/css_types.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/css_types.hpp>
-#include <orcus/global.hpp>
#include <mdds/sorted_string_map.hpp>
#include <mdds/global.hpp>
diff --git a/src/parser/csv_parser_base.cpp b/src/parser/csv_parser_base.cpp
index 8e5b6c25..517e2073 100644
--- a/src/parser/csv_parser_base.cpp
+++ b/src/parser/csv_parser_base.cpp
@@ -6,7 +6,6 @@
*/
#include "orcus/csv_parser_base.hpp"
-#include "orcus/global.hpp"
#include <cstring>
diff --git a/src/parser/json_parser_base.cpp b/src/parser/json_parser_base.cpp
index 354431a0..1e1e1ee6 100644
--- a/src/parser/json_parser_base.cpp
+++ b/src/parser/json_parser_base.cpp
@@ -6,7 +6,6 @@
*/
#include "orcus/json_parser_base.hpp"
-#include "orcus/global.hpp"
#include "orcus/cell_buffer.hpp"
#include "numeric_parser.hpp"
diff --git a/src/parser/json_parser_thread.cpp b/src/parser/json_parser_thread.cpp
index 36bbe6e6..3e5b56e2 100644
--- a/src/parser/json_parser_thread.cpp
+++ b/src/parser/json_parser_thread.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/json_parser_thread.hpp>
-#include <orcus/global.hpp>
#include <orcus/json_parser.hpp>
#include <orcus/string_pool.hpp>
#include <orcus/detail/parser_token_buffer.hpp>
diff --git a/src/parser/parser_base_test.cpp b/src/parser/parser_base_test.cpp
index e25ffb14..6675f24e 100644
--- a/src/parser/parser_base_test.cpp
+++ b/src/parser/parser_base_test.cpp
@@ -7,7 +7,6 @@
#include "test_global.hpp"
#include "orcus/parser_base.hpp"
-#include "orcus/global.hpp"
using namespace std;
using namespace orcus;
diff --git a/src/parser/parser_global.cpp b/src/parser/parser_global.cpp
index 2ef092d0..59ae93b6 100644
--- a/src/parser/parser_global.cpp
+++ b/src/parser/parser_global.cpp
@@ -7,7 +7,6 @@
#include <orcus/parser_global.hpp>
#include <orcus/cell_buffer.hpp>
-#include <orcus/global.hpp>
#include <orcus/exception.hpp>
#include "numeric_parser.hpp"
diff --git a/src/parser/parser_test_numeric.cpp b/src/parser/parser_test_numeric.cpp
index 6cc69234..b16ed9a7 100644
--- a/src/parser/parser_test_numeric.cpp
+++ b/src/parser/parser_test_numeric.cpp
@@ -6,7 +6,6 @@
*/
#include "test_global.hpp"
-#include "orcus/global.hpp"
#include "numeric_parser.hpp"
#include <cassert>
diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
index c9b91e20..54dd89ae 100644
--- a/src/parser/sax_parser_base.cpp
+++ b/src/parser/sax_parser_base.cpp
@@ -6,7 +6,6 @@
*/
#include "orcus/sax_parser_base.hpp"
-#include "orcus/global.hpp"
#include "utf8.hpp"
diff --git a/src/parser/sax_token_parser_test.cpp b/src/parser/sax_token_parser_test.cpp
index b6e32fa1..f3ad5927 100644
--- a/src/parser/sax_token_parser_test.cpp
+++ b/src/parser/sax_token_parser_test.cpp
@@ -8,7 +8,6 @@
#include "test_global.hpp"
#include "orcus/sax_token_parser.hpp"
#include "orcus/tokens.hpp"
-#include "orcus/global.hpp"
#include "orcus/xml_namespace.hpp"
#include <cstring>
diff --git a/src/parser/sax_token_parser_thread.cpp b/src/parser/sax_token_parser_thread.cpp
index d21ae6d7..36cef8f7 100644
--- a/src/parser/sax_token_parser_thread.cpp
+++ b/src/parser/sax_token_parser_thread.cpp
@@ -6,7 +6,6 @@
*/
#include "orcus/sax_token_parser_thread.hpp"
-#include "orcus/global.hpp"
#include "orcus/sax_token_parser.hpp"
#include "orcus/string_pool.hpp"
#include "orcus/detail/parser_token_buffer.hpp"
diff --git a/src/parser/stream.cpp b/src/parser/stream.cpp
index fc6455af..0af9e7fc 100644
--- a/src/parser/stream.cpp
+++ b/src/parser/stream.cpp
@@ -7,7 +7,6 @@
#include <orcus/stream.hpp>
#include <orcus/exception.hpp>
-#include <orcus/global.hpp>
#include <sstream>
#include <fstream>
diff --git a/src/parser/string_pool.cpp b/src/parser/string_pool.cpp
index e9c0248f..137bf93e 100644
--- a/src/parser/string_pool.cpp
+++ b/src/parser/string_pool.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/string_pool.hpp>
-#include <orcus/global.hpp>
#include <orcus/exception.hpp>
#include <iostream>
diff --git a/src/parser/string_pool_test.cpp b/src/parser/string_pool_test.cpp
index 99b24166..1b66d7a6 100644
--- a/src/parser/string_pool_test.cpp
+++ b/src/parser/string_pool_test.cpp
@@ -8,7 +8,6 @@
#include "test_global.hpp"
#include <orcus/string_pool.hpp>
#include "pstring.hpp"
-#include <orcus/global.hpp>
using namespace std;
using namespace orcus;
diff --git a/src/parser/threaded_json_parser_test.cpp b/src/parser/threaded_json_parser_test.cpp
index 67b52896..ecee3984 100644
--- a/src/parser/threaded_json_parser_test.cpp
+++ b/src/parser/threaded_json_parser_test.cpp
@@ -7,7 +7,6 @@
#include "test_global.hpp"
#include <orcus/threaded_json_parser.hpp>
-#include <orcus/global.hpp>
#include <cstring>
diff --git a/src/parser/threaded_sax_token_parser_test.cpp b/src/parser/threaded_sax_token_parser_test.cpp
index 910aeff5..2f2cf1a4 100644
--- a/src/parser/threaded_sax_token_parser_test.cpp
+++ b/src/parser/threaded_sax_token_parser_test.cpp
@@ -8,7 +8,6 @@
#include "test_global.hpp"
#include "orcus/threaded_sax_token_parser.hpp"
#include "orcus/tokens.hpp"
-#include "orcus/global.hpp"
#include "orcus/xml_namespace.hpp"
#include "orcus/parser_base.hpp"
#include "orcus/stream.hpp"
diff --git a/src/parser/types.cpp b/src/parser/types.cpp
index 1f3d1106..074a8506 100644
--- a/src/parser/types.cpp
+++ b/src/parser/types.cpp
@@ -7,7 +7,6 @@
#include <orcus/types.hpp>
#include <orcus/parser_global.hpp>
-#include <orcus/global.hpp>
#include <orcus/xml_namespace.hpp>
#include <limits>
diff --git a/src/parser/xml_namespace.cpp b/src/parser/xml_namespace.cpp
index e7dc6666..9c371ca8 100644
--- a/src/parser/xml_namespace.cpp
+++ b/src/parser/xml_namespace.cpp
@@ -8,7 +8,6 @@
#include <orcus/xml_namespace.hpp>
#include <orcus/exception.hpp>
#include <orcus/string_pool.hpp>
-#include <orcus/global.hpp>
#include <unordered_map>
#include <vector>
diff --git a/src/parser/xml_writer.cpp b/src/parser/xml_writer.cpp
index ee2c00e8..6113ac9c 100644
--- a/src/parser/xml_writer.cpp
+++ b/src/parser/xml_writer.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/xml_writer.hpp>
-#include <orcus/global.hpp>
#include <orcus/xml_namespace.hpp>
#include <orcus/string_pool.hpp>
#include "pstring.hpp"
@@ -72,6 +71,12 @@ void write_content_encoded(std::string_view content, std::ostream& os)
p0 = nullptr;
};
+ constexpr std::string_view cv_lt = "&lt;";
+ constexpr std::string_view cv_gt = "&gt;";
+ constexpr std::string_view cv_amp = "&amp;";
+ constexpr std::string_view cv_apos = "&apos;";
+ constexpr std::string_view cv_quot = "&quot;";
+
const char* p = content.data();
const char* p_end = p + content.size();
const char* p0 = nullptr;
@@ -85,23 +90,23 @@ void write_content_encoded(std::string_view content, std::ostream& os)
{
case '<':
_flush(p0, p);
- os.write(ORCUS_ASCII("&lt;"));
+ os.write(cv_lt.data(), cv_lt.size());
break;
case '>':
_flush(p0, p);
- os.write(ORCUS_ASCII("&gt;"));
+ os.write(cv_gt.data(), cv_gt.size());
break;
case '&':
_flush(p0, p);
- os.write(ORCUS_ASCII("&amp;"));
+ os.write(cv_amp.data(), cv_amp.size());
break;
case '\'':
_flush(p0, p);
- os.write(ORCUS_ASCII("&apos;"));
+ os.write(cv_apos.data(), cv_apos.size());
break;
case '"':
_flush(p0, p);
- os.write(ORCUS_ASCII("&quot;"));
+ os.write(cv_quot.data(), cv_quot.size());
break;
}
}
diff --git a/src/parser/yaml_parser_base.cpp b/src/parser/yaml_parser_base.cpp
index ec402a8f..2ae028ca 100644
--- a/src/parser/yaml_parser_base.cpp
+++ b/src/parser/yaml_parser_base.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/yaml_parser_base.hpp>
-#include <orcus/global.hpp>
#include <orcus/cell_buffer.hpp>
#include <orcus/parser_global.hpp>
diff --git a/src/python/csv.cpp b/src/python/csv.cpp
index eebe28c2..97c5d298 100644
--- a/src/python/csv.cpp
+++ b/src/python/csv.cpp
@@ -13,7 +13,6 @@
#include "orcus/orcus_csv.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/factory.hpp"
-#include "orcus/global.hpp"
#endif
namespace orcus { namespace python {
diff --git a/src/python/formula_token.cpp b/src/python/formula_token.cpp
index ddae680a..07f71402 100644
--- a/src/python/formula_token.cpp
+++ b/src/python/formula_token.cpp
@@ -8,7 +8,6 @@
#include "formula_token.hpp"
#include "global.hpp"
#include "orcus/spreadsheet/document.hpp"
-#include "orcus/global.hpp"
#include <ixion/formula.hpp>
#include <ixion/formula_name_resolver.hpp>
diff --git a/src/python/gnumeric.cpp b/src/python/gnumeric.cpp
index 9c123040..162f18f7 100644
--- a/src/python/gnumeric.cpp
+++ b/src/python/gnumeric.cpp
@@ -13,7 +13,6 @@
#include "orcus/orcus_gnumeric.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/factory.hpp"
-#include "orcus/global.hpp"
#endif
namespace orcus { namespace python {
diff --git a/src/python/ods.cpp b/src/python/ods.cpp
index 7abd67d0..0a7f5ad6 100644
--- a/src/python/ods.cpp
+++ b/src/python/ods.cpp
@@ -13,7 +13,6 @@
#include "orcus/orcus_ods.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/factory.hpp"
-#include "orcus/global.hpp"
#endif
namespace orcus { namespace python {
diff --git a/src/python/xls_xml.cpp b/src/python/xls_xml.cpp
index 0dd51750..5caf747f 100644
--- a/src/python/xls_xml.cpp
+++ b/src/python/xls_xml.cpp
@@ -13,7 +13,6 @@
#include "orcus/orcus_xls_xml.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/factory.hpp"
-#include "orcus/global.hpp"
#endif
namespace orcus { namespace python {
diff --git a/src/python/xlsx.cpp b/src/python/xlsx.cpp
index c1e54112..56cf47d8 100644
--- a/src/python/xlsx.cpp
+++ b/src/python/xlsx.cpp
@@ -13,7 +13,6 @@
#include "orcus/orcus_xlsx.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/factory.hpp"
-#include "orcus/global.hpp"
#endif
namespace orcus { namespace python {
diff --git a/src/spreadsheet/document_impl.hpp b/src/spreadsheet/document_impl.hpp
index 20b71761..3541e9eb 100644
--- a/src/spreadsheet/document_impl.hpp
+++ b/src/spreadsheet/document_impl.hpp
@@ -7,7 +7,6 @@
#pragma once
-#include <orcus/global.hpp>
#include <orcus/spreadsheet/auto_filter.hpp>
#include <orcus/spreadsheet/config.hpp>
#include <orcus/spreadsheet/document.hpp>
diff --git a/src/spreadsheet/factory.cpp b/src/spreadsheet/factory.cpp
index 505f7108..513d5b01 100644
--- a/src/spreadsheet/factory.cpp
+++ b/src/spreadsheet/factory.cpp
@@ -13,7 +13,6 @@
#include <orcus/spreadsheet/document.hpp>
#include <orcus/spreadsheet/view.hpp>
#include <orcus/exception.hpp>
-#include <orcus/global.hpp>
#include <orcus/string_pool.hpp>
#include "pstring.hpp"
diff --git a/src/spreadsheet/factory_pivot.cpp b/src/spreadsheet/factory_pivot.cpp
index 7e7a067c..518c3aa8 100644
--- a/src/spreadsheet/factory_pivot.cpp
+++ b/src/spreadsheet/factory_pivot.cpp
@@ -7,7 +7,6 @@
#include "factory_pivot.hpp"
-#include "orcus/global.hpp"
#include "orcus/string_pool.hpp"
#include "orcus/exception.hpp"
diff --git a/src/spreadsheet/factory_sheet.cpp b/src/spreadsheet/factory_sheet.cpp
index 61541174..f73d8c9b 100644
--- a/src/spreadsheet/factory_sheet.cpp
+++ b/src/spreadsheet/factory_sheet.cpp
@@ -9,7 +9,6 @@
#include "orcus/spreadsheet/sheet.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/view.hpp"
-#include "orcus/global.hpp"
#include "orcus/measurement.hpp"
#include "orcus/string_pool.hpp"
diff --git a/src/spreadsheet/factory_styles.cpp b/src/spreadsheet/factory_styles.cpp
index 78d38cf5..094ed89d 100644
--- a/src/spreadsheet/factory_styles.cpp
+++ b/src/spreadsheet/factory_styles.cpp
@@ -7,7 +7,6 @@
#include "orcus/spreadsheet/factory.hpp"
#include "orcus/spreadsheet/styles.hpp"
-#include "orcus/global.hpp"
#include "orcus/string_pool.hpp"
namespace orcus { namespace spreadsheet {
diff --git a/src/spreadsheet/factory_table.cpp b/src/spreadsheet/factory_table.cpp
index 87d625aa..432228dc 100644
--- a/src/spreadsheet/factory_table.cpp
+++ b/src/spreadsheet/factory_table.cpp
@@ -8,7 +8,6 @@
#include "factory_table.hpp"
#include "formula_global.hpp"
-#include "orcus/global.hpp"
#include "orcus/string_pool.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/sheet.hpp"
diff --git a/src/spreadsheet/global_settings.cpp b/src/spreadsheet/global_settings.cpp
index ed68ed63..71778bd7 100644
--- a/src/spreadsheet/global_settings.cpp
+++ b/src/spreadsheet/global_settings.cpp
@@ -8,7 +8,6 @@
#include "global_settings.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/factory.hpp"
-#include "orcus/global.hpp"
namespace orcus { namespace spreadsheet {
diff --git a/src/spreadsheet/html_dumper.cpp b/src/spreadsheet/html_dumper.cpp
index 5212095f..df93b2b0 100644
--- a/src/spreadsheet/html_dumper.cpp
+++ b/src/spreadsheet/html_dumper.cpp
@@ -13,7 +13,6 @@
#include "orcus/spreadsheet/shared_strings.hpp"
#include "orcus/spreadsheet/document.hpp"
#include "orcus/spreadsheet/sheet.hpp"
-#include "orcus/global.hpp"
#include <ixion/address.hpp>
#include <ixion/model_context.hpp>
diff --git a/src/spreadsheet/pivot.cpp b/src/spreadsheet/pivot.cpp
index 271b8a1a..4bc21ee8 100644
--- a/src/spreadsheet/pivot.cpp
+++ b/src/spreadsheet/pivot.cpp
@@ -7,7 +7,6 @@
#include "orcus/spreadsheet/pivot.hpp"
#include "orcus/spreadsheet/document.hpp"
-#include "orcus/global.hpp"
#include "orcus/string_pool.hpp"
#include <ixion/address.hpp>
diff --git a/src/spreadsheet/shared_strings.cpp b/src/spreadsheet/shared_strings.cpp
index aa521272..e9a82d60 100644
--- a/src/spreadsheet/shared_strings.cpp
+++ b/src/spreadsheet/shared_strings.cpp
@@ -6,7 +6,6 @@
*/
#include <orcus/spreadsheet/shared_strings.hpp>
-#include <orcus/global.hpp>
#include <ixion/model_context.hpp>
#include <iostream>
diff --git a/src/spreadsheet/styles.cpp b/src/spreadsheet/styles.cpp
index dd1ee798..662c0130 100644
--- a/src/spreadsheet/styles.cpp
+++ b/src/spreadsheet/styles.cpp
@@ -6,7 +6,6 @@
*/
#include "orcus/spreadsheet/styles.hpp"
-#include "orcus/global.hpp"
#include "orcus/string_pool.hpp"
#include "ostream_utils.hpp"
diff --git a/src/spreadsheet/view.cpp b/src/spreadsheet/view.cpp
index 1d0146a5..7e21fff2 100644
--- a/src/spreadsheet/view.cpp
+++ b/src/spreadsheet/view.cpp
@@ -7,7 +7,6 @@
#include "orcus/spreadsheet/view.hpp"
#include "orcus/spreadsheet/document.hpp"
-#include "orcus/global.hpp"
#include <cassert>
#include <iostream>