25 files changed, 24 insertions, 0 deletions
diff --git a/aclk/schema-wrappers/agent_cmds.cc b/src/aclk/schema-wrappers/agent_cmds.cc
index 6950f4025..6950f4025 100644
--- a/aclk/schema-wrappers/agent_cmds.cc
+++ b/src/aclk/schema-wrappers/agent_cmds.cc
diff --git a/aclk/schema-wrappers/agent_cmds.h b/src/aclk/schema-wrappers/agent_cmds.h
index 7e01f86c5..7e01f86c5 100644
--- a/aclk/schema-wrappers/agent_cmds.h
+++ b/src/aclk/schema-wrappers/agent_cmds.h
diff --git a/aclk/schema-wrappers/alarm_config.cc b/src/aclk/schema-wrappers/alarm_config.cc
index 64d28f324..64d28f324 100644
--- a/aclk/schema-wrappers/alarm_config.cc
+++ b/src/aclk/schema-wrappers/alarm_config.cc
diff --git a/aclk/schema-wrappers/alarm_config.h b/src/aclk/schema-wrappers/alarm_config.h
index 3c9a5d9a8..3c9a5d9a8 100644
--- a/aclk/schema-wrappers/alarm_config.h
+++ b/src/aclk/schema-wrappers/alarm_config.h
diff --git a/aclk/schema-wrappers/alarm_stream.cc b/src/aclk/schema-wrappers/alarm_stream.cc
index 29d80e39e..29d80e39e 100644
--- a/aclk/schema-wrappers/alarm_stream.cc
+++ b/src/aclk/schema-wrappers/alarm_stream.cc
diff --git a/aclk/schema-wrappers/alarm_stream.h b/src/aclk/schema-wrappers/alarm_stream.h
index 3c81ff445..3c81ff445 100644
--- a/aclk/schema-wrappers/alarm_stream.h
+++ b/src/aclk/schema-wrappers/alarm_stream.h
diff --git a/aclk/schema-wrappers/capability.cc b/src/aclk/schema-wrappers/capability.cc
index af45740a9..af45740a9 100644
--- a/aclk/schema-wrappers/capability.cc
+++ b/src/aclk/schema-wrappers/capability.cc
diff --git a/aclk/schema-wrappers/capability.h b/src/aclk/schema-wrappers/capability.h
index c6085a44b..c6085a44b 100644
--- a/aclk/schema-wrappers/capability.h
+++ b/src/aclk/schema-wrappers/capability.h
diff --git a/aclk/schema-wrappers/connection.cc b/src/aclk/schema-wrappers/connection.cc
index 20b40ece2..20b40ece2 100644
--- a/aclk/schema-wrappers/connection.cc
+++ b/src/aclk/schema-wrappers/connection.cc
diff --git a/aclk/schema-wrappers/connection.h b/src/aclk/schema-wrappers/connection.h
index 0356c7d78..0356c7d78 100644
--- a/aclk/schema-wrappers/connection.h
+++ b/src/aclk/schema-wrappers/connection.h
diff --git a/aclk/schema-wrappers/context.cc b/src/aclk/schema-wrappers/context.cc
index b04c9d20c..b04c9d20c 100644
--- a/aclk/schema-wrappers/context.cc
+++ b/src/aclk/schema-wrappers/context.cc
diff --git a/aclk/schema-wrappers/context.h b/src/aclk/schema-wrappers/context.h
index cbb7701a8..cbb7701a8 100644
--- a/aclk/schema-wrappers/context.h
+++ b/src/aclk/schema-wrappers/context.h
diff --git a/aclk/schema-wrappers/context_stream.cc b/src/aclk/schema-wrappers/context_stream.cc
index 3bb1956cb..3bb1956cb 100644
--- a/aclk/schema-wrappers/context_stream.cc
+++ b/src/aclk/schema-wrappers/context_stream.cc
diff --git a/aclk/schema-wrappers/context_stream.h b/src/aclk/schema-wrappers/context_stream.h
index 8c691d2cc..8c691d2cc 100644
--- a/aclk/schema-wrappers/context_stream.h
+++ b/src/aclk/schema-wrappers/context_stream.h
diff --git a/aclk/schema-wrappers/node_connection.cc b/src/aclk/schema-wrappers/node_connection.cc
index db1fa6449..db1fa6449 100644
--- a/aclk/schema-wrappers/node_connection.cc
+++ b/src/aclk/schema-wrappers/node_connection.cc
diff --git a/aclk/schema-wrappers/node_connection.h b/src/aclk/schema-wrappers/node_connection.h
index dac0d8fe0..dac0d8fe0 100644
--- a/aclk/schema-wrappers/node_connection.h
+++ b/src/aclk/schema-wrappers/node_connection.h
diff --git a/aclk/schema-wrappers/node_creation.cc b/src/aclk/schema-wrappers/node_creation.cc
index 5ad25b7e5..5ad25b7e5 100644
--- a/aclk/schema-wrappers/node_creation.cc
+++ b/src/aclk/schema-wrappers/node_creation.cc
diff --git a/aclk/schema-wrappers/node_creation.h b/src/aclk/schema-wrappers/node_creation.h
index 7a8c7f7c7..7a8c7f7c7 100644
--- a/aclk/schema-wrappers/node_creation.h
+++ b/src/aclk/schema-wrappers/node_creation.h
diff --git a/aclk/schema-wrappers/node_info.cc b/src/aclk/schema-wrappers/node_info.cc
index 5e321f688..5e321f688 100644
--- a/aclk/schema-wrappers/node_info.cc
+++ b/src/aclk/schema-wrappers/node_info.cc
diff --git a/aclk/schema-wrappers/node_info.h b/src/aclk/schema-wrappers/node_info.h
index 4f57601df..4f57601df 100644
--- a/aclk/schema-wrappers/node_info.h
+++ b/src/aclk/schema-wrappers/node_info.h
diff --git a/aclk/schema-wrappers/proto_2_json.cc b/src/aclk/schema-wrappers/proto_2_json.cc
index 854396510..854396510 100644
--- a/aclk/schema-wrappers/proto_2_json.cc
+++ b/src/aclk/schema-wrappers/proto_2_json.cc
diff --git a/aclk/schema-wrappers/proto_2_json.h b/src/aclk/schema-wrappers/proto_2_json.h
index 3bd98478c..3bd98478c 100644
--- a/aclk/schema-wrappers/proto_2_json.h
+++ b/src/aclk/schema-wrappers/proto_2_json.h
diff --git a/aclk/schema-wrappers/schema_wrapper_utils.cc b/src/aclk/schema-wrappers/schema_wrapper_utils.cc
index 96a4b9bf1..96a4b9bf1 100644
--- a/aclk/schema-wrappers/schema_wrapper_utils.cc
+++ b/src/aclk/schema-wrappers/schema_wrapper_utils.cc
diff --git a/src/aclk/schema-wrappers/schema_wrapper_utils.h b/src/aclk/schema-wrappers/schema_wrapper_utils.h
new file mode 100644
index 000000000..693a4ce5f
--- /dev/null
+++ b/src/aclk/schema-wrappers/schema_wrapper_utils.h
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef SCHEMA_WRAPPER_UTILS_H
+#define SCHEMA_WRAPPER_UTILS_H
+
+#include "database/rrd.h"
+
+#include <sys/time.h>
+#include <google/protobuf/timestamp.pb.h>
+#include <google/protobuf/map.h>
+
+#if GOOGLE_PROTOBUF_VERSION < 3001000
+#define PROTO_COMPAT_MSG_SIZE(msg) (size_t)msg.ByteSize()
+#define PROTO_COMPAT_MSG_SIZE_PTR(msg) (size_t)msg->ByteSize()
+#else
+#define PROTO_COMPAT_MSG_SIZE(msg) msg.ByteSizeLong()
+#define PROTO_COMPAT_MSG_SIZE_PTR(msg) msg->ByteSizeLong()
+#endif
+
+void set_google_timestamp_from_timeval(struct timeval tv, google::protobuf::Timestamp *ts);
+void set_timeval_from_google_timestamp(const google::protobuf::Timestamp &ts, struct timeval *tv);
+int label_add_to_map_callback(const char *name, const char *value, RRDLABEL_SRC ls, void *data);
+
+#endif /* SCHEMA_WRAPPER_UTILS_H */
diff --git a/aclk/schema-wrappers/schema_wrappers.h b/src/aclk/schema-wrappers/schema_wrappers.h
index b651b8845..b651b8845 100644
--- a/aclk/schema-wrappers/schema_wrappers.h
+++ b/src/aclk/schema-wrappers/schema_wrappers.h