diff --git a/examples/c++/qt/advanced-with-c++-api/qtsail.h b/examples/c++/qt/advanced-with-c++-api/qtsail.h
index e4ca0863..db965af9 100644
--- a/examples/c++/qt/advanced-with-c++-api/qtsail.h
+++ b/examples/c++/qt/advanced-with-c++-api/qtsail.h
@@ -32,7 +32,7 @@
 #include <QScopedPointer>
 #include <QVector>
 
-#include <sail-common/error.h>
+#include <sail-common/status.h>
 
 namespace Ui {
     class QtSail;
diff --git a/examples/c++/qt/advanced-with-c-api/qtsail.h b/examples/c++/qt/advanced-with-c-api/qtsail.h
index f81aa06d..320b605a 100644
--- a/examples/c++/qt/advanced-with-c-api/qtsail.h
+++ b/examples/c++/qt/advanced-with-c-api/qtsail.h
@@ -30,7 +30,7 @@
 #include <QScopedPointer>
 #include <QVector>
 
-#include <sail-common/error.h>
+#include <sail-common/status.h>
 
 namespace Ui {
     class QtSail;
diff --git a/examples/c++/qt/junior-with-c++-api/qtsail.h b/examples/c++/qt/junior-with-c++-api/qtsail.h
index 4c531501..5c2fde3d 100644
--- a/examples/c++/qt/junior-with-c++-api/qtsail.h
+++ b/examples/c++/qt/junior-with-c++-api/qtsail.h
@@ -30,7 +30,7 @@
 #include <QScopedPointer>
 #include <QImage>
 
-#include <sail-common/error.h>
+#include <sail-common/status.h>
 
 namespace Ui {
     class QtSail;
diff --git a/examples/c++/qt/junior-with-c-api/qtsail.h b/examples/c++/qt/junior-with-c-api/qtsail.h
index 4c531501..5c2fde3d 100644
--- a/examples/c++/qt/junior-with-c-api/qtsail.h
+++ b/examples/c++/qt/junior-with-c-api/qtsail.h
@@ -30,7 +30,7 @@
 #include <QScopedPointer>
 #include <QImage>
 
-#include <sail-common/error.h>
+#include <sail-common/status.h>
 
 namespace Ui {
     class QtSail;
diff --git a/src/bindings/c++/abstract_io-c++.h b/src/bindings/c++/abstract_io-c++.h
index 76802045..d9b4fb11 100644
--- a/src/bindings/c++/abstract_io-c++.h
+++ b/src/bindings/c++/abstract_io-c++.h
@@ -31,13 +31,13 @@
 #include <cstdio> /* seek whence */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "codec_info-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/codec_info-c++.h>
 #endif
diff --git a/src/bindings/c++/abstract_io_adapter-c++.h b/src/bindings/c++/abstract_io_adapter-c++.h
index f9a3d1d1..153c0965 100644
--- a/src/bindings/c++/abstract_io_adapter-c++.h
+++ b/src/bindings/c++/abstract_io_adapter-c++.h
@@ -29,11 +29,11 @@
 #include <memory>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_io;
diff --git a/src/bindings/c++/codec_info-c++.h b/src/bindings/c++/codec_info-c++.h
index 0e2117f1..7379b341 100644
--- a/src/bindings/c++/codec_info-c++.h
+++ b/src/bindings/c++/codec_info-c++.h
@@ -32,12 +32,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_codec_info;
diff --git a/src/bindings/c++/context-c++.h b/src/bindings/c++/context-c++.h
index ccab4ac7..02325e3b 100644
--- a/src/bindings/c++/context-c++.h
+++ b/src/bindings/c++/context-c++.h
@@ -27,13 +27,13 @@
 #define SAIL_CONTEXT_CPP_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "context.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail/context.h>
 #endif
diff --git a/src/bindings/c++/conversion_options-c++.h b/src/bindings/c++/conversion_options-c++.h
index d6575c80..0a791521 100644
--- a/src/bindings/c++/conversion_options-c++.h
+++ b/src/bindings/c++/conversion_options-c++.h
@@ -29,15 +29,15 @@
 #include <memory>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
     #include "pixel.h"
+    #include "status.h"
 
     #include "manip_common.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
     #include <sail-common/pixel.h>
+    #include <sail-common/status.h>
 
     #include <sail-manip/manip_common.h>
 #endif
diff --git a/src/bindings/c++/iccp-c++.h b/src/bindings/c++/iccp-c++.h
index c593de82..fecea092 100644
--- a/src/bindings/c++/iccp-c++.h
+++ b/src/bindings/c++/iccp-c++.h
@@ -30,13 +30,13 @@
 #include <memory>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
 #endif
diff --git a/src/bindings/c++/image-c++.h b/src/bindings/c++/image-c++.h
index 0b3bb55d..c4f1c01d 100644
--- a/src/bindings/c++/image-c++.h
+++ b/src/bindings/c++/image-c++.h
@@ -33,8 +33,8 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "iccp-c++.h"
     #include "palette-c++.h"
@@ -42,8 +42,8 @@
     #include "resolution-c++.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/iccp-c++.h>
     #include <sail-c++/palette-c++.h>
diff --git a/src/bindings/c++/image_input-c++.h b/src/bindings/c++/image_input-c++.h
index fa4c126f..ba1fb438 100644
--- a/src/bindings/c++/image_input-c++.h
+++ b/src/bindings/c++/image_input-c++.h
@@ -32,14 +32,14 @@
 #include <tuple>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
     #include "image-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
     #include <sail-c++/image-c++.h>
diff --git a/src/bindings/c++/image_output-c++.h b/src/bindings/c++/image_output-c++.h
index 4a07b130..493d1184 100644
--- a/src/bindings/c++/image_output-c++.h
+++ b/src/bindings/c++/image_output-c++.h
@@ -31,13 +31,13 @@
 #include <string>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
 #endif
diff --git a/src/bindings/c++/load_features-c++.h b/src/bindings/c++/load_features-c++.h
index 883fe5f5..b31550c2 100644
--- a/src/bindings/c++/load_features-c++.h
+++ b/src/bindings/c++/load_features-c++.h
@@ -30,13 +30,13 @@
 #include <vector>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "tuning-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/tuning-c++.h>
 #endif
diff --git a/src/bindings/c++/load_options-c++.h b/src/bindings/c++/load_options-c++.h
index d35ffb47..b9a4b279 100644
--- a/src/bindings/c++/load_options-c++.h
+++ b/src/bindings/c++/load_options-c++.h
@@ -30,13 +30,13 @@
 #include <vector>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "tuning-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/tuning-c++.h>
 #endif
diff --git a/src/bindings/c++/log-c++.h b/src/bindings/c++/log-c++.h
index d203280e..153a7f48 100644
--- a/src/bindings/c++/log-c++.h
+++ b/src/bindings/c++/log-c++.h
@@ -27,13 +27,13 @@
 #define SAIL_LOG_CPP_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
     #include "log.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
     #include <sail-common/log.h>
+    #include <sail-common/status.h>
 #endif
 
 namespace sail
diff --git a/src/bindings/c++/meta_data-c++.h b/src/bindings/c++/meta_data-c++.h
index 7376a523..d13b4f9d 100644
--- a/src/bindings/c++/meta_data-c++.h
+++ b/src/bindings/c++/meta_data-c++.h
@@ -31,14 +31,14 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
 #endif
diff --git a/src/bindings/c++/palette-c++.h b/src/bindings/c++/palette-c++.h
index 2d13ff0d..9ac23801 100644
--- a/src/bindings/c++/palette-c++.h
+++ b/src/bindings/c++/palette-c++.h
@@ -30,14 +30,14 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
 #endif
diff --git a/src/bindings/c++/resolution-c++.h b/src/bindings/c++/resolution-c++.h
index 235b55f6..b6125bc0 100644
--- a/src/bindings/c++/resolution-c++.h
+++ b/src/bindings/c++/resolution-c++.h
@@ -31,12 +31,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_resolution;
diff --git a/src/bindings/c++/save_features-c++.h b/src/bindings/c++/save_features-c++.h
index 3b529322..646f3b40 100644
--- a/src/bindings/c++/save_features-c++.h
+++ b/src/bindings/c++/save_features-c++.h
@@ -31,15 +31,15 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "compression_level-c++.h"
     #include "tuning-c++.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/compression_level-c++.h>
     #include <sail-c++/tuning-c++.h>
diff --git a/src/bindings/c++/save_options-c++.h b/src/bindings/c++/save_options-c++.h
index 57d1cc13..6e29398f 100644
--- a/src/bindings/c++/save_options-c++.h
+++ b/src/bindings/c++/save_options-c++.h
@@ -31,14 +31,14 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "tuning-c++.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/tuning-c++.h>
 #endif
diff --git a/src/bindings/c++/source_image-c++.h b/src/bindings/c++/source_image-c++.h
index 21bd8c70..431269c8 100644
--- a/src/bindings/c++/source_image-c++.h
+++ b/src/bindings/c++/source_image-c++.h
@@ -30,14 +30,14 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "special_properties-c++.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/special_properties-c++.h>
 #endif
diff --git a/src/bindings/c++/utils-c++.h b/src/bindings/c++/utils-c++.h
index 96e591d0..7ace2506 100644
--- a/src/bindings/c++/utils-c++.h
+++ b/src/bindings/c++/utils-c++.h
@@ -30,13 +30,13 @@
 #include <string>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
 #endif
diff --git a/src/bindings/c++/utils_private-c++.h b/src/bindings/c++/utils_private-c++.h
index 1622966b..da85d231 100644
--- a/src/bindings/c++/utils_private-c++.h
+++ b/src/bindings/c++/utils_private-c++.h
@@ -27,8 +27,8 @@
 #define SAIL_UTILS_PRIVATE_CPP_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "tuning-c++.h"
 #else
diff --git a/src/bindings/c++/variant-c++.h b/src/bindings/c++/variant-c++.h
index 5b294dfb..c58ceac9 100644
--- a/src/bindings/c++/variant-c++.h
+++ b/src/bindings/c++/variant-c++.h
@@ -29,13 +29,13 @@
 #include <memory>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "arbitrary_data-c++.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail-c++/arbitrary_data-c++.h>
 #endif
diff --git a/src/libsail-common/CMakeLists.txt b/src/libsail-common/CMakeLists.txt
index b5050d21..aa8c8b5f 100644
--- a/src/libsail-common/CMakeLists.txt
+++ b/src/libsail-common/CMakeLists.txt
@@ -13,7 +13,6 @@ add_library(sail-common
                 compiler_specifics.h
                 compression_level.h
                 compression_level.c
-                error.h
                 export.h
                 hash_map.c
                 hash_map.h
@@ -51,6 +50,7 @@ add_library(sail-common
                 save_options.h
                 source_image.c
                 source_image.h
+                status.h
                 string_node.c
                 string_node.h
                 utils.c
@@ -66,7 +66,6 @@ set(PUBLIC_HEADERS common.h
                    common_serialize.h
                    compiler_specifics.h
                    compression_level.h
-                   error.h
                    export.h
                    hash_map.h
                    iccp.h
@@ -85,6 +84,7 @@ set(PUBLIC_HEADERS common.h
                    save_features.h
                    save_options.h
                    source_image.h
+                   status.h
                    string_node.h
                    utils.h
                    variant.h
diff --git a/src/libsail-common/common.h b/src/libsail-common/common.h
index 31a59701..54acb228 100644
--- a/src/libsail-common/common.h
+++ b/src/libsail-common/common.h
@@ -27,11 +27,11 @@
 #define SAIL_COMMON_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 /*
diff --git a/src/libsail-common/compression_level.h b/src/libsail-common/compression_level.h
index 3ae7ff98..0f1474f4 100644
--- a/src/libsail-common/compression_level.h
+++ b/src/libsail-common/compression_level.h
@@ -27,11 +27,11 @@
 #define SAIL_COMPRESSION_LEVEL_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/hash_map.h b/src/libsail-common/hash_map.h
index 091776b8..ec345c72 100644
--- a/src/libsail-common/hash_map.h
+++ b/src/libsail-common/hash_map.h
@@ -29,11 +29,11 @@
 #include <stdbool.h>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/iccp.h b/src/libsail-common/iccp.h
index 5ece9181..2e2314db 100644
--- a/src/libsail-common/iccp.h
+++ b/src/libsail-common/iccp.h
@@ -29,11 +29,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/image.h b/src/libsail-common/image.h
index 5e7ec26d..4a132e84 100644
--- a/src/libsail-common/image.h
+++ b/src/libsail-common/image.h
@@ -30,12 +30,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/io_common.h b/src/libsail-common/io_common.h
index 3e3a5780..e419f49a 100644
--- a/src/libsail-common/io_common.h
+++ b/src/libsail-common/io_common.h
@@ -32,11 +32,11 @@
 #include <stdio.h>  /* SEEK_CUR */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/linked_list_node.h b/src/libsail-common/linked_list_node.h
index 543b3fb8..35ced372 100644
--- a/src/libsail-common/linked_list_node.h
+++ b/src/libsail-common/linked_list_node.h
@@ -27,11 +27,11 @@
 #define SAIL_LINKED_LIST_NODE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/load_features.h b/src/libsail-common/load_features.h
index 842b1d78..d5b70948 100644
--- a/src/libsail-common/load_features.h
+++ b/src/libsail-common/load_features.h
@@ -27,11 +27,11 @@
 #define SAIL_LOAD_FEATURES_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/load_options.h b/src/libsail-common/load_options.h
index 9cc7aaca..9c425546 100644
--- a/src/libsail-common/load_options.h
+++ b/src/libsail-common/load_options.h
@@ -27,11 +27,11 @@
 #define SAIL_LOAD_OPTIONS_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/memory.h b/src/libsail-common/memory.h
index 112feea6..93325e00 100644
--- a/src/libsail-common/memory.h
+++ b/src/libsail-common/memory.h
@@ -29,11 +29,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/meta_data.h b/src/libsail-common/meta_data.h
index 778adcbe..c7e4c415 100644
--- a/src/libsail-common/meta_data.h
+++ b/src/libsail-common/meta_data.h
@@ -30,12 +30,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/meta_data_node.h b/src/libsail-common/meta_data_node.h
index 0eccf9c3..3ad54206 100644
--- a/src/libsail-common/meta_data_node.h
+++ b/src/libsail-common/meta_data_node.h
@@ -27,11 +27,11 @@
 #define SAIL_META_DATA_NODE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/palette.h b/src/libsail-common/palette.h
index 530053da..12ecb6e4 100644
--- a/src/libsail-common/palette.h
+++ b/src/libsail-common/palette.h
@@ -28,12 +28,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/pixel.h b/src/libsail-common/pixel.h
index 7ce3f0dc..7ea44cb6 100644
--- a/src/libsail-common/pixel.h
+++ b/src/libsail-common/pixel.h
@@ -29,11 +29,11 @@
 #include <stdint.h>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/resolution.h b/src/libsail-common/resolution.h
index 4e5101a5..232da4c0 100644
--- a/src/libsail-common/resolution.h
+++ b/src/libsail-common/resolution.h
@@ -28,12 +28,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/sail-common.h b/src/libsail-common/sail-common.h
index 71001abd..b4c960cb 100644
--- a/src/libsail-common/sail-common.h
+++ b/src/libsail-common/sail-common.h
@@ -35,7 +35,6 @@
     #include "common_serialize.h"
     #include "compiler_specifics.h"
     #include "compression_level.h"
-    #include "error.h"
     #include "export.h"
     #include "hash_map.h"
     #include "hash_map_p.h"
@@ -55,6 +54,7 @@
     #include "save_features.h"
     #include "save_options.h"
     #include "source_image.h"
+    #include "status.h"
     #include "string_node.h"
     #include "utils.h"
     #include "variant.h"
@@ -66,7 +66,6 @@
     #include <sail-common/common_serialize.h>
     #include <sail-common/compiler_specifics.h>
     #include <sail-common/compression_level.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
     #include <sail-common/hash_map.h>
     #include <sail-common/iccp.h>
@@ -84,6 +83,7 @@
     #include <sail-common/save_features.h>
     #include <sail-common/save_options.h>
     #include <sail-common/source_image.h>
+    #include <sail-common/status.h>
     #include <sail-common/string_node.h>
     #include <sail-common/utils.h>
     #include <sail-common/variant.h>
diff --git a/src/libsail-common/save_features.h b/src/libsail-common/save_features.h
index 244f3867..2302e3c0 100644
--- a/src/libsail-common/save_features.h
+++ b/src/libsail-common/save_features.h
@@ -28,12 +28,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/save_options.h b/src/libsail-common/save_options.h
index 9e220e58..3d904639 100644
--- a/src/libsail-common/save_options.h
+++ b/src/libsail-common/save_options.h
@@ -28,12 +28,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/source_image.h b/src/libsail-common/source_image.h
index 9f4c62e2..f0c31b12 100644
--- a/src/libsail-common/source_image.h
+++ b/src/libsail-common/source_image.h
@@ -30,12 +30,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/error.h b/src/libsail-common/status.h
similarity index 99%
rename from src/libsail-common/error.h
rename to src/libsail-common/status.h
index 7a9697f1..c11b002d 100644
--- a/src/libsail-common/error.h
+++ b/src/libsail-common/status.h
@@ -23,8 +23,8 @@
     SOFTWARE.
 */
 
-#ifndef SAIL_ERROR_H
-#define SAIL_ERROR_H
+#ifndef SAIL_STATUS_H
+#define SAIL_STATUS_H
 
 #ifdef SAIL_BUILD
     #include "compiler_specifics.h"
diff --git a/src/libsail-common/string_node.h b/src/libsail-common/string_node.h
index 8b268008..c4d67d8a 100644
--- a/src/libsail-common/string_node.h
+++ b/src/libsail-common/string_node.h
@@ -27,11 +27,11 @@
 #define SAIL_STRING_NODE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/utils.h b/src/libsail-common/utils.h
index 5d2480c4..bdf3e741 100644
--- a/src/libsail-common/utils.h
+++ b/src/libsail-common/utils.h
@@ -33,12 +33,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_image;
diff --git a/src/libsail-common/variant.h b/src/libsail-common/variant.h
index 3e0ca898..8f9c51b0 100644
--- a/src/libsail-common/variant.h
+++ b/src/libsail-common/variant.h
@@ -32,12 +32,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-common/variant_node.h b/src/libsail-common/variant_node.h
index 620ccd06..88249a61 100644
--- a/src/libsail-common/variant_node.h
+++ b/src/libsail-common/variant_node.h
@@ -27,11 +27,11 @@
 #define SAIL_VARIANT_NODE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-manip/conversion_options.h b/src/libsail-manip/conversion_options.h
index 375ee359..955183cb 100644
--- a/src/libsail-manip/conversion_options.h
+++ b/src/libsail-manip/conversion_options.h
@@ -27,15 +27,15 @@
 #define SAIL_CONVERSION_OPTIONS_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
     #include "pixel.h"
+    #include "status.h"
 
     #include "manip_common.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
     #include <sail-common/pixel.h>
+    #include <sail-common/status.h>
 
     #include <sail-manip/manip_common.h>
 #endif
diff --git a/src/libsail-manip/convert.h b/src/libsail-manip/convert.h
index 090dac51..fc436ded 100644
--- a/src/libsail-manip/convert.h
+++ b/src/libsail-manip/convert.h
@@ -31,12 +31,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail-manip/manip_utils.h b/src/libsail-manip/manip_utils.h
index 23383e89..b2a65b33 100644
--- a/src/libsail-manip/manip_utils.h
+++ b/src/libsail-manip/manip_utils.h
@@ -28,8 +28,8 @@
 
 #include <stdint.h>
 
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_conversion_options;
 struct sail_palette;
diff --git a/src/libsail/codec.h b/src/libsail/codec.h
index 736f46fe..a2bec13c 100644
--- a/src/libsail/codec.h
+++ b/src/libsail/codec.h
@@ -27,13 +27,13 @@
 #define SAIL_CODEC_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "layout/v8_pointers.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail/layout/v8_pointers.h>
 #endif
diff --git a/src/libsail/codec_bundle_private.h b/src/libsail/codec_bundle_private.h
index db7fa95c..d2909ede 100644
--- a/src/libsail/codec_bundle_private.h
+++ b/src/libsail/codec_bundle_private.h
@@ -27,11 +27,11 @@
 #define SAIL_CODEC_BUNDLE_PRIVATE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_codec_bundle;
diff --git a/src/libsail/codec_info.h b/src/libsail/codec_info.h
index 5a3a4c41..a56a4046 100644
--- a/src/libsail/codec_info.h
+++ b/src/libsail/codec_info.h
@@ -29,13 +29,13 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 
     #include "codec_priority.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 
     #include <sail/codec_priority.h>
 #endif
diff --git a/src/libsail/codec_info_private.h b/src/libsail/codec_info_private.h
index ef103521..ef88c332 100644
--- a/src/libsail/codec_info_private.h
+++ b/src/libsail/codec_info_private.h
@@ -27,11 +27,11 @@
 #define SAIL_CODEC_INFO_PRIVATE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_codec_info;
diff --git a/src/libsail/context.h b/src/libsail/context.h
index fba56d34..af5a0883 100644
--- a/src/libsail/context.h
+++ b/src/libsail/context.h
@@ -27,11 +27,11 @@
 #define SAIL_CONTEXT_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/context_private.h b/src/libsail/context_private.h
index 5a3729e3..93f77d0f 100644
--- a/src/libsail/context_private.h
+++ b/src/libsail/context_private.h
@@ -29,11 +29,11 @@
 #include <stdbool.h>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_codec_bundle_node;
diff --git a/src/libsail/io_file.h b/src/libsail/io_file.h
index d13cbdfb..b30d9c5b 100644
--- a/src/libsail/io_file.h
+++ b/src/libsail/io_file.h
@@ -27,11 +27,11 @@
 #define SAIL_IO_FILE_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/io_memory.h b/src/libsail/io_memory.h
index d2b4e11a..d5692312 100644
--- a/src/libsail/io_memory.h
+++ b/src/libsail/io_memory.h
@@ -29,11 +29,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/io_noop.h b/src/libsail/io_noop.h
index 3c9509e4..7f950c0a 100644
--- a/src/libsail/io_noop.h
+++ b/src/libsail/io_noop.h
@@ -30,11 +30,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/layout/v8.h b/src/libsail/layout/v8.h
index 130b7984..96f23810 100644
--- a/src/libsail/layout/v8.h
+++ b/src/libsail/layout/v8.h
@@ -35,9 +35,9 @@
  */
 
 #ifdef SAIL_BUILD
-#include "error.h"
+#include "status.h"
 #else
-#include <sail-common/error.h>
+#include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/sail_advanced.h b/src/libsail/sail_advanced.h
index 9690972c..a25c453a 100644
--- a/src/libsail/sail_advanced.h
+++ b/src/libsail/sail_advanced.h
@@ -29,11 +29,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/sail_deep_diver.h b/src/libsail/sail_deep_diver.h
index 48a64013..8633be01 100644
--- a/src/libsail/sail_deep_diver.h
+++ b/src/libsail/sail_deep_diver.h
@@ -29,11 +29,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/sail_junior.h b/src/libsail/sail_junior.h
index 56618d63..a285c666 100644
--- a/src/libsail/sail_junior.h
+++ b/src/libsail/sail_junior.h
@@ -29,11 +29,11 @@
 #include <stddef.h> /* size_t */
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/sail_private.h b/src/libsail/sail_private.h
index 4ff59eee..065fe3e3 100644
--- a/src/libsail/sail_private.h
+++ b/src/libsail/sail_private.h
@@ -31,12 +31,12 @@
 
 #ifdef SAIL_BUILD
     #include "common.h"
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
     #include <sail-common/common.h>
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_codec_info;
diff --git a/src/libsail/sail_technical_diver.h b/src/libsail/sail_technical_diver.h
index 7c914414..35ecd980 100644
--- a/src/libsail/sail_technical_diver.h
+++ b/src/libsail/sail_technical_diver.h
@@ -27,11 +27,11 @@
 #define SAIL_SAIL_TECHNICAL_DIVER_H
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/src/libsail/sail_technical_diver_private.h b/src/libsail/sail_technical_diver_private.h
index 4f1bb494..ee3509bf 100644
--- a/src/libsail/sail_technical_diver_private.h
+++ b/src/libsail/sail_technical_diver_private.h
@@ -29,11 +29,11 @@
 #include <stdbool.h>
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 struct sail_codec_info;
diff --git a/src/libsail/threading.h b/src/libsail/threading.h
index 497528ab..b9628cad 100644
--- a/src/libsail/threading.h
+++ b/src/libsail/threading.h
@@ -29,11 +29,11 @@
 #include "config.h"
 
 #ifdef SAIL_BUILD
-    #include "error.h"
     #include "export.h"
+    #include "status.h"
 #else
-    #include <sail-common/error.h>
     #include <sail-common/export.h>
+    #include <sail-common/status.h>
 #endif
 
 #ifdef SAIL_WIN32
diff --git a/src/sail-codecs/avif/helpers.h b/src/sail-codecs/avif/helpers.h
index c91c985e..82c6fb46 100644
--- a/src/sail-codecs/avif/helpers.h
+++ b/src/sail-codecs/avif/helpers.h
@@ -32,8 +32,8 @@
 #include <avif/avif.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 SAIL_HIDDEN enum SailPixelFormat avif_private_sail_pixel_format(enum avifPixelFormat avif_pixel_format, uint32_t depth, bool has_alpha);
 
diff --git a/src/sail-codecs/avif/io.h b/src/sail-codecs/avif/io.h
index abbfdb1f..579da36d 100644
--- a/src/sail-codecs/avif/io.h
+++ b/src/sail-codecs/avif/io.h
@@ -30,8 +30,8 @@
 
 #include <avif/avif.h>
 
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_avif_context {
     struct sail_io *io;
diff --git a/src/sail-codecs/common/bmp/bmp.h b/src/sail-codecs/common/bmp/bmp.h
index 5947be4a..31efd896 100644
--- a/src/sail-codecs/common/bmp/bmp.h
+++ b/src/sail-codecs/common/bmp/bmp.h
@@ -26,8 +26,8 @@
 #ifndef SAIL_BMP_COMMON_H
 #define SAIL_BMP_COMMON_H
 
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_image;
 struct sail_io;
diff --git a/src/sail-codecs/common/bmp/helpers.h b/src/sail-codecs/common/bmp/helpers.h
index 6d196b2b..51a73bd4 100644
--- a/src/sail-codecs/common/bmp/helpers.h
+++ b/src/sail-codecs/common/bmp/helpers.h
@@ -29,9 +29,9 @@
 #include <stdint.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
 #include "pixel.h"
+#include "status.h"
 
 struct sail_iccp;
 struct sail_io;
diff --git a/src/sail-codecs/gif/helpers.h b/src/sail-codecs/gif/helpers.h
index 5588f63c..6c18db16 100644
--- a/src/sail-codecs/gif/helpers.h
+++ b/src/sail-codecs/gif/helpers.h
@@ -29,8 +29,8 @@
 #include <gif_lib.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_meta_data_node;
 
diff --git a/src/sail-codecs/ico/helpers.h b/src/sail-codecs/ico/helpers.h
index 8726a04d..3eccff4c 100644
--- a/src/sail-codecs/ico/helpers.h
+++ b/src/sail-codecs/ico/helpers.h
@@ -28,8 +28,8 @@
 
 #include <stdint.h>
 
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_io;
 
diff --git a/src/sail-codecs/jpeg2000/helpers.h b/src/sail-codecs/jpeg2000/helpers.h
index 5540ed09..15bba6fe 100644
--- a/src/sail-codecs/jpeg2000/helpers.h
+++ b/src/sail-codecs/jpeg2000/helpers.h
@@ -29,8 +29,8 @@
 #include <jasper/jas_cm.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 SAIL_HIDDEN enum SailPixelFormat jpeg2000_private_sail_pixel_format(jas_clrspc_t jasper_color_space, int bpp);
 
diff --git a/src/sail-codecs/jpegxl/helpers.h b/src/sail-codecs/jpegxl/helpers.h
index 179b8881..89ef716b 100644
--- a/src/sail-codecs/jpegxl/helpers.h
+++ b/src/sail-codecs/jpegxl/helpers.h
@@ -32,8 +32,8 @@
 #include <jxl/decode.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_hash_map;
 struct sail_iccp;
diff --git a/src/sail-codecs/pcx/helpers.h b/src/sail-codecs/pcx/helpers.h
index 1c97962a..36f49c7d 100644
--- a/src/sail-codecs/pcx/helpers.h
+++ b/src/sail-codecs/pcx/helpers.h
@@ -29,8 +29,8 @@
 #include <stdint.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 enum SailPcxVersion
 {
diff --git a/src/sail-codecs/png/helpers.h b/src/sail-codecs/png/helpers.h
index 16afc69b..2830ef7d 100644
--- a/src/sail-codecs/png/helpers.h
+++ b/src/sail-codecs/png/helpers.h
@@ -32,8 +32,8 @@
 #include <png.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_hash_map;
 struct sail_iccp;
diff --git a/src/sail-codecs/psd/helpers.h b/src/sail-codecs/psd/helpers.h
index 7e699712..8031d251 100644
--- a/src/sail-codecs/psd/helpers.h
+++ b/src/sail-codecs/psd/helpers.h
@@ -29,8 +29,8 @@
 #include <stdint.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 /* PSD pixel formats. */
 enum SailPsdMode {
diff --git a/src/sail-codecs/tga/helpers.h b/src/sail-codecs/tga/helpers.h
index f19cfe74..66180805 100644
--- a/src/sail-codecs/tga/helpers.h
+++ b/src/sail-codecs/tga/helpers.h
@@ -29,8 +29,8 @@
 #include <stdint.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_io;
 struct sail_meta_data_node;
diff --git a/src/sail-codecs/tiff/helpers.h b/src/sail-codecs/tiff/helpers.h
index ff0baf44..64b721b2 100644
--- a/src/sail-codecs/tiff/helpers.h
+++ b/src/sail-codecs/tiff/helpers.h
@@ -32,8 +32,8 @@
 #include <tiffio.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct sail_meta_data_node;
 struct sail_resolution;
diff --git a/src/sail-codecs/wal/helpers.h b/src/sail-codecs/wal/helpers.h
index 7322724e..c8824906 100644
--- a/src/sail-codecs/wal/helpers.h
+++ b/src/sail-codecs/wal/helpers.h
@@ -27,8 +27,8 @@
 #define SAIL_WAL_HELPERS_H
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 struct WalFileHeader
 {
diff --git a/src/sail-codecs/webp/helpers.h b/src/sail-codecs/webp/helpers.h
index a0675c93..e6021f69 100644
--- a/src/sail-codecs/webp/helpers.h
+++ b/src/sail-codecs/webp/helpers.h
@@ -31,8 +31,8 @@
 #include <webp/demux.h>
 
 #include "common.h"
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 SAIL_HIDDEN void webp_private_fill_color(uint8_t *pixels, unsigned bytes_per_line, unsigned bytes_per_pixel,
                                             uint32_t color, unsigned x, unsigned y, unsigned width, unsigned height);
diff --git a/tests/sail-comparators/sail-comparators.h b/tests/sail-comparators/sail-comparators.h
index f6584549..a5923c05 100644
--- a/tests/sail-comparators/sail-comparators.h
+++ b/tests/sail-comparators/sail-comparators.h
@@ -26,8 +26,8 @@
 #ifndef SAIL_COMPARATORS_H
 #define SAIL_COMPARATORS_H
 
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 SAIL_EXPORT sail_status_t sail_test_compare_resolutions(const struct sail_resolution *resolution1, const struct sail_resolution *resolution2);
 
diff --git a/tests/sail-dump/sail-dump.h b/tests/sail-dump/sail-dump.h
index d0ab673a..66d50737 100644
--- a/tests/sail-dump/sail-dump.h
+++ b/tests/sail-dump/sail-dump.h
@@ -26,8 +26,8 @@
 #ifndef SAIL_DUMP_H
 #define SAIL_DUMP_H
 
-#include "error.h"
 #include "export.h"
+#include "status.h"
 
 /*
  * Reads a dump file from path + ".dump".