diff --git a/circleci/Dockerfile b/circleci/Dockerfile
index b23d75375..b60406809 100644
--- a/circleci/Dockerfile
+++ b/circleci/Dockerfile
@@ -24,7 +24,6 @@ RUN set -ex \
libsnmp-base \
libsnmp-dev \
libssl-dev \
- libsystemd-dev \
make \
pkg-config \
python3 \
diff --git a/deb-arm/Dockerfile b/deb-arm/Dockerfile
index 3c808e9fb..467f025b2 100644
--- a/deb-arm/Dockerfile
+++ b/deb-arm/Dockerfile
@@ -47,7 +47,7 @@ ENV BUNDLER_VERSION $BUNDLER_VERSION
RUN grep -v return /root/.bashrc >> /root/newbashrc && cp /root/newbashrc /root/.bashrc
RUN apt-get update && apt-get install -y fakeroot curl git procps bzip2 \
- build-essential pkg-config tar libsystemd-dev libkrb5-dev \
+ build-essential pkg-config tar libkrb5-dev \
gettext libtool autopoint autoconf libtool-bin \
selinux-basics default-jre flex
diff --git a/deb-x64/Dockerfile b/deb-x64/Dockerfile
index 9d08c25ec..f3bfb89e8 100644
--- a/deb-x64/Dockerfile
+++ b/deb-x64/Dockerfile
@@ -73,7 +73,7 @@ RUN echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf.d/20datadog
RUN apt-get update && apt-get install -y fakeroot procps bzip2 \
build-essential pkg-config libssl-dev libcurl4-openssl-dev libexpat-dev libpq-dev libz-dev \
- libsystemd-journal-dev rpm tar gettext libtool autopoint autoconf pkg-config flex \
+ rpm tar gettext libtool autopoint autoconf pkg-config flex \
selinux-basics libtool software-properties-common default-jre texinfo pxz
# Ubuntu 14.04 comes with gcc 4.8 by default, which has a tough time compiling newer Go versions
diff --git a/rpm-arm64/Dockerfile b/rpm-arm64/Dockerfile
index 48d2768fc..de5306031 100644
--- a/rpm-arm64/Dockerfile
+++ b/rpm-arm64/Dockerfile
@@ -38,7 +38,7 @@ ENV BUNDLER_VERSION $BUNDLER_VERSION
# The last two lines contain dependencies for build of newer rpm
RUN yum -y install @development which perl-core perl-ExtUtils-MakeMaker ncurses-compat-libs git procps \
- curl-devel expat-devel gettext-devel openssl-devel systemd-devel zlib-devel bzip2 glibc-static python-devel tar pkgconfig \
+ curl-devel expat-devel gettext-devel openssl-devel zlib-devel bzip2 glibc-static python-devel tar pkgconfig \
libtool autoconf policycoreutils-python \
bzip2-devel e2fsprogs-devel file-devel libacl-devel libarchive-devel libattr-devel \
libxml2-devel lzo-devel nss nss-devel popt-devel sharutils xz-devel java \
diff --git a/rpm-armhf/Dockerfile b/rpm-armhf/Dockerfile
index d398d3d95..f719566af 100644
--- a/rpm-armhf/Dockerfile
+++ b/rpm-armhf/Dockerfile
@@ -35,7 +35,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
# The last two lines contain dependencies for build of newer rpm
RUN yum -y install @development which perl-ExtUtils-MakeMaker ncurses-compat-libs git procps \
- curl-devel expat-devel gettext-devel openssl-devel systemd-devel zlib-devel bzip2 glibc-static tar pkgconfig \
+ curl-devel expat-devel gettext-devel openssl-devel zlib-devel bzip2 glibc-static tar pkgconfig \
libtool autoconf policycoreutils-python \
bzip2-devel e2fsprogs-devel file-devel libacl-devel libarchive-devel libattr-devel \
libxml2-devel lzo-devel nss nss-devel popt-devel sharutils xz-devel java \
diff --git a/rpm-headers/README.md b/rpm-headers/README.md
deleted file mode 100644
index 263c9bc8b..000000000
--- a/rpm-headers/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# systemd
-
-To build the log-agent journald integration on Centos 7, we need to build the
-agent with the systemd tag.
-This will trigger the build of code that calls the `coreos/go-systemd` package.
-To compile, this package requires some systemd headers to be present.
-
-We collected the headers from systemd version 219 (the default systemd version
-on Centos 7) and we put them on our Centos 6 based builder image. It works because
-the binary doesn't expect systemd shared objects for dynamic linking.
-
-Instead the systemd shared objects are loaded at runtime by the go code: ([see here](https://github.com/coreos/go-systemd/blob/c8cc474ba8655dfbdb0ac7fcc09b7faf5b643caf/sdjournal/functions.go#L46))
-
-If the shared objects are not present on the computer, the `go-systemd` package
-returns an error that we gracefully handle in the setup of a journald tailer.
diff --git a/rpm-headers/systemd/_sd-common.h b/rpm-headers/systemd/_sd-common.h
deleted file mode 100644
index e9426a450..000000000
--- a/rpm-headers/systemd/_sd-common.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosdcommonhfoo
-#define foosdcommonhfoo
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see .
-***/
-
-/* This is a private header; never even think of including this directly! */
-
-#if defined __INCLUDE_LEVEL__ && __INCLUDE_LEVEL__ <= 1
-#error "Do not include _sd-common.h directly; it is a private header."
-#endif
-
-#ifndef _sd_printf_
-# if __GNUC__ >= 4
-# define _sd_printf_(a,b) __attribute__ ((format (printf, a, b)))
-# else
-# define _sd_printf_(a,b)
-# endif
-#endif
-
-#ifndef _sd_sentinel_
-# define _sd_sentinel_ __attribute__((sentinel))
-#endif
-
-#ifndef _sd_packed_
-# define _sd_packed_ __attribute__((packed))
-#endif
-
-#ifndef _sd_pure_
-# define _sd_pure_ __attribute__((pure))
-#endif
-
-#ifndef _SD_STRINGIFY
-# define _SD_XSTRINGIFY(x) #x
-# define _SD_STRINGIFY(x) _SD_XSTRINGIFY(x)
-#endif
-
-#ifndef _SD_BEGIN_DECLARATIONS
-# ifdef __cplusplus
-# define _SD_BEGIN_DECLARATIONS \
- extern "C" { \
- struct __useless_struct_to_allow_trailing_semicolon__
-# else
-# define _SD_BEGIN_DECLARATIONS \
- struct __useless_struct_to_allow_trailing_semicolon__
-# endif
-#endif
-
-#ifndef _SD_END_DECLARATIONS
-# ifdef __cplusplus
-# define _SD_END_DECLARATIONS \
- } \
- struct __useless_struct_to_allow_trailing_semicolon__
-# else
-# define _SD_END_DECLARATIONS \
- struct __useless_struct_to_allow_trailing_semicolon__
-# endif
-#endif
-
-#endif
diff --git a/rpm-headers/systemd/sd-id128.h b/rpm-headers/systemd/sd-id128.h
deleted file mode 100644
index 9f445278b..000000000
--- a/rpm-headers/systemd/sd-id128.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosdid128hfoo
-#define foosdid128hfoo
-
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see .
-***/
-
-#include
-#include
-
-#include "_sd-common.h"
-
-_SD_BEGIN_DECLARATIONS;
-
-/* 128-bit ID APIs. See sd-id128(3) for more information. */
-
-typedef union sd_id128 sd_id128_t;
-
-union sd_id128 {
- uint8_t bytes[16];
- uint64_t qwords[2];
-};
-
-#define SD_ID128_STRING_MAX 33
-
-char *sd_id128_to_string(sd_id128_t id, char s[SD_ID128_STRING_MAX]);
-
-int sd_id128_from_string(const char *s, sd_id128_t *ret);
-
-int sd_id128_randomize(sd_id128_t *ret);
-
-int sd_id128_get_machine(sd_id128_t *ret);
-
-int sd_id128_get_boot(sd_id128_t *ret);
-
-#define SD_ID128_MAKE(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
- ((const sd_id128_t) { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \
- 0x##v8, 0x##v9, 0x##v10, 0x##v11, 0x##v12, 0x##v13, 0x##v14, 0x##v15 }})
-
-#define SD_ID128_ARRAY(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
- { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \
- 0x##v8, 0x##v9, 0x##v10, 0x##v11, 0x##v12, 0x##v13, 0x##v14, 0x##v15 }}
-
-/* Note that SD_ID128_FORMAT_VAL will evaluate the passed argument 16
- * times. It is hence not a good idea to call this macro with an
- * expensive function as parameter or an expression with side
- * effects */
-
-#define SD_ID128_FORMAT_STR "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-#define SD_ID128_FORMAT_VAL(x) (x).bytes[0], (x).bytes[1], (x).bytes[2], (x).bytes[3], (x).bytes[4], (x).bytes[5], (x).bytes[6], (x).bytes[7], (x).bytes[8], (x).bytes[9], (x).bytes[10], (x).bytes[11], (x).bytes[12], (x).bytes[13], (x).bytes[14], (x).bytes[15]
-
-#define SD_ID128_CONST_STR(x) \
- ((const char[SD_ID128_STRING_MAX]) { \
- ((x).bytes[0] >> 4) >= 10 ? 'a' + ((x).bytes[0] >> 4) - 10 : '0' + ((x).bytes[0] >> 4), \
- ((x).bytes[0] & 15) >= 10 ? 'a' + ((x).bytes[0] & 15) - 10 : '0' + ((x).bytes[0] & 15), \
- ((x).bytes[1] >> 4) >= 10 ? 'a' + ((x).bytes[1] >> 4) - 10 : '0' + ((x).bytes[1] >> 4), \
- ((x).bytes[1] & 15) >= 10 ? 'a' + ((x).bytes[1] & 15) - 10 : '0' + ((x).bytes[1] & 15), \
- ((x).bytes[2] >> 4) >= 10 ? 'a' + ((x).bytes[2] >> 4) - 10 : '0' + ((x).bytes[2] >> 4), \
- ((x).bytes[2] & 15) >= 10 ? 'a' + ((x).bytes[2] & 15) - 10 : '0' + ((x).bytes[2] & 15), \
- ((x).bytes[3] >> 4) >= 10 ? 'a' + ((x).bytes[3] >> 4) - 10 : '0' + ((x).bytes[3] >> 4), \
- ((x).bytes[3] & 15) >= 10 ? 'a' + ((x).bytes[3] & 15) - 10 : '0' + ((x).bytes[3] & 15), \
- ((x).bytes[4] >> 4) >= 10 ? 'a' + ((x).bytes[4] >> 4) - 10 : '0' + ((x).bytes[4] >> 4), \
- ((x).bytes[4] & 15) >= 10 ? 'a' + ((x).bytes[4] & 15) - 10 : '0' + ((x).bytes[4] & 15), \
- ((x).bytes[5] >> 4) >= 10 ? 'a' + ((x).bytes[5] >> 4) - 10 : '0' + ((x).bytes[5] >> 4), \
- ((x).bytes[5] & 15) >= 10 ? 'a' + ((x).bytes[5] & 15) - 10 : '0' + ((x).bytes[5] & 15), \
- ((x).bytes[6] >> 4) >= 10 ? 'a' + ((x).bytes[6] >> 4) - 10 : '0' + ((x).bytes[6] >> 4), \
- ((x).bytes[6] & 15) >= 10 ? 'a' + ((x).bytes[6] & 15) - 10 : '0' + ((x).bytes[6] & 15), \
- ((x).bytes[7] >> 4) >= 10 ? 'a' + ((x).bytes[7] >> 4) - 10 : '0' + ((x).bytes[7] >> 4), \
- ((x).bytes[7] & 15) >= 10 ? 'a' + ((x).bytes[7] & 15) - 10 : '0' + ((x).bytes[7] & 15), \
- ((x).bytes[8] >> 4) >= 10 ? 'a' + ((x).bytes[8] >> 4) - 10 : '0' + ((x).bytes[8] >> 4), \
- ((x).bytes[8] & 15) >= 10 ? 'a' + ((x).bytes[8] & 15) - 10 : '0' + ((x).bytes[8] & 15), \
- ((x).bytes[9] >> 4) >= 10 ? 'a' + ((x).bytes[9] >> 4) - 10 : '0' + ((x).bytes[9] >> 4), \
- ((x).bytes[9] & 15) >= 10 ? 'a' + ((x).bytes[9] & 15) - 10 : '0' + ((x).bytes[9] & 15), \
- ((x).bytes[10] >> 4) >= 10 ? 'a' + ((x).bytes[10] >> 4) - 10 : '0' + ((x).bytes[10] >> 4), \
- ((x).bytes[10] & 15) >= 10 ? 'a' + ((x).bytes[10] & 15) - 10 : '0' + ((x).bytes[10] & 15), \
- ((x).bytes[11] >> 4) >= 10 ? 'a' + ((x).bytes[11] >> 4) - 10 : '0' + ((x).bytes[11] >> 4), \
- ((x).bytes[11] & 15) >= 10 ? 'a' + ((x).bytes[11] & 15) - 10 : '0' + ((x).bytes[11] & 15), \
- ((x).bytes[12] >> 4) >= 10 ? 'a' + ((x).bytes[12] >> 4) - 10 : '0' + ((x).bytes[12] >> 4), \
- ((x).bytes[12] & 15) >= 10 ? 'a' + ((x).bytes[12] & 15) - 10 : '0' + ((x).bytes[12] & 15), \
- ((x).bytes[13] >> 4) >= 10 ? 'a' + ((x).bytes[13] >> 4) - 10 : '0' + ((x).bytes[13] >> 4), \
- ((x).bytes[13] & 15) >= 10 ? 'a' + ((x).bytes[13] & 15) - 10 : '0' + ((x).bytes[13] & 15), \
- ((x).bytes[14] >> 4) >= 10 ? 'a' + ((x).bytes[14] >> 4) - 10 : '0' + ((x).bytes[14] >> 4), \
- ((x).bytes[14] & 15) >= 10 ? 'a' + ((x).bytes[14] & 15) - 10 : '0' + ((x).bytes[14] & 15), \
- ((x).bytes[15] >> 4) >= 10 ? 'a' + ((x).bytes[15] >> 4) - 10 : '0' + ((x).bytes[15] >> 4), \
- ((x).bytes[15] & 15) >= 10 ? 'a' + ((x).bytes[15] & 15) - 10 : '0' + ((x).bytes[15] & 15), \
- 0 })
-
-_sd_pure_ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) {
- return memcmp(&a, &b, 16) == 0;
-}
-
-_sd_pure_ static inline int sd_id128_is_null(sd_id128_t a) {
- return a.qwords[0] == 0 && a.qwords[1] == 0;
-}
-
-#define SD_ID128_NULL ((const sd_id128_t) { .qwords = { 0, 0 }})
-
-_SD_END_DECLARATIONS;
-
-#endif
diff --git a/rpm-headers/systemd/sd-journal.h b/rpm-headers/systemd/sd-journal.h
deleted file mode 100644
index d5fd46eea..000000000
--- a/rpm-headers/systemd/sd-journal.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosdjournalhfoo
-#define foosdjournalhfoo
-
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see .
-***/
-
-#include
-#include
-#include
-#include
-#include
-
-#include "sd-id128.h"
-#include "_sd-common.h"
-
-/* Journal APIs. See sd-journal(3) for more information. */
-
-_SD_BEGIN_DECLARATIONS;
-
-/* Write to daemon */
-int sd_journal_print(int priority, const char *format, ...) _sd_printf_(2, 3);
-int sd_journal_printv(int priority, const char *format, va_list ap) _sd_printf_(2, 0);
-int sd_journal_send(const char *format, ...) _sd_printf_(1, 0) _sd_sentinel_;
-int sd_journal_sendv(const struct iovec *iov, int n);
-int sd_journal_perror(const char *message);
-
-/* Used by the macros below. You probably don't want to call this directly. */
-int sd_journal_print_with_location(int priority, const char *file, const char *line, const char *func, const char *format, ...) _sd_printf_(5, 6);
-int sd_journal_printv_with_location(int priority, const char *file, const char *line, const char *func, const char *format, va_list ap) _sd_printf_(5, 0);
-int sd_journal_send_with_location(const char *file, const char *line, const char *func, const char *format, ...) _sd_printf_(4, 0) _sd_sentinel_;
-int sd_journal_sendv_with_location(const char *file, const char *line, const char *func, const struct iovec *iov, int n);
-int sd_journal_perror_with_location(const char *file, const char *line, const char *func, const char *message);
-
-/* implicitly add code location to messages sent, if this is enabled */
-#ifndef SD_JOURNAL_SUPPRESS_LOCATION
-
-#define sd_journal_print(priority, ...) sd_journal_print_with_location(priority, "CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, __VA_ARGS__)
-#define sd_journal_printv(priority, format, ap) sd_journal_printv_with_location(priority, "CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, format, ap)
-#define sd_journal_send(...) sd_journal_send_with_location("CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, __VA_ARGS__)
-#define sd_journal_sendv(iovec, n) sd_journal_sendv_with_location("CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, iovec, n)
-#define sd_journal_perror(message) sd_journal_perror_with_location("CODE_FILE=" __FILE__, "CODE_LINE=" _SD_STRINGIFY(__LINE__), __func__, message)
-
-#endif
-
-int sd_journal_stream_fd(const char *identifier, int priority, int level_prefix);
-
-/* Browse journal stream */
-
-typedef struct sd_journal sd_journal;
-
-/* Open flags */
-enum {
- SD_JOURNAL_LOCAL_ONLY = 1,
- SD_JOURNAL_RUNTIME_ONLY = 2,
- SD_JOURNAL_SYSTEM = 4,
- SD_JOURNAL_CURRENT_USER = 8,
-
- SD_JOURNAL_SYSTEM_ONLY = SD_JOURNAL_SYSTEM, /* deprecated name */
-};
-
-/* Wakeup event types */
-enum {
- SD_JOURNAL_NOP,
- SD_JOURNAL_APPEND,
- SD_JOURNAL_INVALIDATE
-};
-
-int sd_journal_open(sd_journal **ret, int flags);
-int sd_journal_open_directory(sd_journal **ret, const char *path, int flags);
-int sd_journal_open_files(sd_journal **ret, const char **paths, int flags);
-int sd_journal_open_container(sd_journal **ret, const char *machine, int flags);
-void sd_journal_close(sd_journal *j);
-
-int sd_journal_previous(sd_journal *j);
-int sd_journal_next(sd_journal *j);
-
-int sd_journal_previous_skip(sd_journal *j, uint64_t skip);
-int sd_journal_next_skip(sd_journal *j, uint64_t skip);
-
-int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret);
-int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id);
-
-int sd_journal_set_data_threshold(sd_journal *j, size_t sz);
-int sd_journal_get_data_threshold(sd_journal *j, size_t *sz);
-
-int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *l);
-int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *l);
-void sd_journal_restart_data(sd_journal *j);
-
-int sd_journal_add_match(sd_journal *j, const void *data, size_t size);
-int sd_journal_add_disjunction(sd_journal *j);
-int sd_journal_add_conjunction(sd_journal *j);
-void sd_journal_flush_matches(sd_journal *j);
-
-int sd_journal_seek_head(sd_journal *j);
-int sd_journal_seek_tail(sd_journal *j);
-int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec);
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);
-int sd_journal_seek_cursor(sd_journal *j, const char *cursor);
-
-int sd_journal_get_cursor(sd_journal *j, char **cursor);
-int sd_journal_test_cursor(sd_journal *j, const char *cursor);
-
-int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from, uint64_t *to);
-int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, const sd_id128_t boot_id, uint64_t *from, uint64_t *to);
-
-int sd_journal_get_usage(sd_journal *j, uint64_t *bytes);
-
-int sd_journal_query_unique(sd_journal *j, const char *field);
-int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l);
-void sd_journal_restart_unique(sd_journal *j);
-
-int sd_journal_get_fd(sd_journal *j);
-int sd_journal_get_events(sd_journal *j);
-int sd_journal_get_timeout(sd_journal *j, uint64_t *timeout_usec);
-int sd_journal_process(sd_journal *j);
-int sd_journal_wait(sd_journal *j, uint64_t timeout_usec);
-int sd_journal_reliable_fd(sd_journal *j);
-
-int sd_journal_get_catalog(sd_journal *j, char **text);
-int sd_journal_get_catalog_for_message_id(sd_id128_t id, char **text);
-
-int sd_journal_has_runtime_files(sd_journal *j);
-int sd_journal_has_persistent_files(sd_journal *j);
-
-/* the inverse condition avoids ambiguity of danling 'else' after the macro */
-#define SD_JOURNAL_FOREACH(j) \
- if (sd_journal_seek_head(j) < 0) { } \
- else while (sd_journal_next(j) > 0)
-
-/* the inverse condition avoids ambiguity of danling 'else' after the macro */
-#define SD_JOURNAL_FOREACH_BACKWARDS(j) \
- if (sd_journal_seek_tail(j) < 0) { } \
- else while (sd_journal_previous(j) > 0)
-
-#define SD_JOURNAL_FOREACH_DATA(j, data, l) \
- for (sd_journal_restart_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
-
-#define SD_JOURNAL_FOREACH_UNIQUE(j, data, l) \
- for (sd_journal_restart_unique(j); sd_journal_enumerate_unique((j), &(data), &(l)) > 0; )
-
-_SD_END_DECLARATIONS;
-
-#endif
diff --git a/rpm-x64/Dockerfile b/rpm-x64/Dockerfile
index 15a694ad1..d35010463 100644
--- a/rpm-x64/Dockerfile
+++ b/rpm-x64/Dockerfile
@@ -202,9 +202,6 @@ RUN mkdir -p /opt/mqm \
&& tar -C /opt/mqm -xf /tmp/mq_client.tar.gz \
&& rm -rf /tmp/mq_client.tar.gz
-# Add systemd headers
-COPY ./rpm-headers/systemd /usr/include/systemd
-
# CMake
RUN set -ex \
&& curl -sL -o cmake.sh "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh" \
diff --git a/suse-x64/Dockerfile b/suse-x64/Dockerfile
index 587c73fea..f0daaa7c6 100644
--- a/suse-x64/Dockerfile
+++ b/suse-x64/Dockerfile
@@ -99,9 +99,6 @@ RUN curl -sL -o /tmp/golang.tar.gz https://go.dev/dl/go$GO_VERSION.linux-amd64.t
ENV PATH="/usr/local/go/bin:${PATH}"
ENV PATH="${GOPATH}/bin:${PATH}"
-# Add systemd headers
-COPY ./rpm-headers/systemd /usr/include/systemd
-
# IBM MQ
RUN mkdir -p /opt/mqm \
&& curl "https://s3.amazonaws.com/dd-agent-omnibus/ibm-mq-backup/${IBM_MQ_VERSION}-IBM-MQC-Redist-LinuxX64.tar.gz" -o /tmp/mq_client.tar.gz \