diff --git a/CODING_STYLE b/CODING_STYLE
index 4b84479d20..c5f1e2e6c9 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -2,7 +2,7 @@
 - 8ch indent, no tabs
 
 - Variables and functions *must* be static, unless they have a
-  protoype, and are supposed to be exported.
+  prototype, and are supposed to be exported.
 
 - structs in MixedCase, variables + functions in lower_case
 
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index eb85276b40..459f87957f 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -740,7 +740,7 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev
                 }
         }
 
-        if(!to_print)
+        if (!to_print)
                 return r;
 
         STRV_FOREACH(c, deps) {
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 1f40c2edf4..fec63721a8 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -234,8 +234,7 @@ static int parse_args(int argc, char *argv[]) {
         return 0;
 }
 
-static void do_journal_append(char *file)
-{
+static void do_journal_append(char *file) {
         struct iovec iovec[5];
         int r, f, j = 0;
         ssize_t n;
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index c088cad7f5..c21f6e86b4 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -509,7 +509,7 @@ static void svg_pss_graph(void) {
                         continue;
 
                 enc_name = xml_comment_encode(ps->name);
-                if(!enc_name)
+                if (!enc_name)
                         continue;
 
                 svg("<!-- %s [%d] pss=", enc_name, ps->pid);
@@ -1009,7 +1009,7 @@ static void svg_ps_bars(void) {
                 int t;
 
                 enc_name = xml_comment_encode(ps->name);
-                if(!enc_name)
+                if (!enc_name)
                         continue;
 
                 /* leave some trace of what we actually filtered etc. */
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 284319f9af..468df35bac 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -114,7 +114,7 @@ static void change_runlevel(Server *s, int runlevel) {
         assert(s);
 
         target = translate_runlevel(runlevel, &isolate);
-        if(!target) {
+        if (!target) {
                 log_warning("Got request for unknown runlevel %c, ignoring.", runlevel);
                 return;
         }
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index ec65ff5221..2b24ff8a94 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -214,7 +214,7 @@ static int parse_argv(int argc, char *argv[], Set *matches) {
 
         if (optind < argc) {
                 const char *cmd = argv[optind++];
-                if(streq(cmd, "list"))
+                if (streq(cmd, "list"))
                         arg_action = ACTION_LIST;
                 else if (streq(cmd, "dump"))
                         arg_action = ACTION_DUMP;
diff --git a/src/libsystemd-bus/bus-dump.c b/src/libsystemd-bus/bus-dump.c
index 71de081649..ddad4183a2 100644
--- a/src/libsystemd-bus/bus-dump.c
+++ b/src/libsystemd-bus/bus-dump.c
@@ -117,7 +117,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, bool with_header) {
 
         fprintf(f, "  MESSAGE \"%s\" {\n", strempty(m->root_container.signature));
 
-        for(;;) {
+        for (;;) {
                 _cleanup_free_ char *prefix = NULL;
                 const char *contents = NULL;
                 char type;
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index d37eec3f99..0fa7807bbb 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -51,8 +51,7 @@ static const char conf_file_dirs[] =
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
-                             const char *fn, const char *format, va_list args)
-{
+                             const char *fn, const char *format, va_list args) {
         log_metav(priority, file, line, fn, format, args);
 }
 #pragma GCC diagnostic pop
diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index bc5db19049..1012606985 100644
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -129,8 +129,7 @@ cleanup:
         return 0;
 }
 
-static void Reader_dealloc(Reader* self)
-{
+static void Reader_dealloc(Reader* self) {
     sd_journal_close(self->j);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
@@ -151,8 +150,7 @@ PyDoc_STRVAR(Reader__doc__,
              "`flags`, `path`, and `files` are exclusive.\n\n"
              "_Reader implements the context manager protocol: the journal\n"
              "will be closed when exiting the block.");
-static int Reader_init(Reader *self, PyObject *args, PyObject *keywds)
-{
+static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) {
     int flags = 0, r;
     char *path = NULL;
     char **files = NULL;
@@ -188,8 +186,7 @@ PyDoc_STRVAR(Reader_fileno__doc__,
              "Get a file descriptor to poll for changes in the journal.\n"
              "This method invokes sd_journal_get_fd().\n"
              "See man:sd_journal_get_fd(3).");
-static PyObject* Reader_fileno(Reader *self, PyObject *args)
-{
+static PyObject* Reader_fileno(Reader *self, PyObject *args) {
     int fd = sd_journal_get_fd(self->j);
     set_error(fd, NULL, NULL);
     if (fd < 0)
@@ -203,8 +200,7 @@ PyDoc_STRVAR(Reader_reliable_fd__doc__,
              "Returns True iff the journal can be polled reliably.\n"
              "This method invokes sd_journal_reliable_fd().\n"
              "See man:sd_journal_reliable_fd(3).");
-static PyObject* Reader_reliable_fd(Reader *self, PyObject *args)
-{
+static PyObject* Reader_reliable_fd(Reader *self, PyObject *args) {
     int r = sd_journal_reliable_fd(self->j);
     set_error(r, NULL, NULL);
     if (r < 0)
@@ -218,8 +214,7 @@ PyDoc_STRVAR(Reader_get_events__doc__,
              "Returns a mask of poll() events to wait for on the file\n"
              "descriptor returned by .fileno().\n\n"
              "See man:sd_journal_get_events(3) for further discussion.");
-static PyObject* Reader_get_events(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_events(Reader *self, PyObject *args) {
     int r = sd_journal_get_events(self->j);
     set_error(r, NULL, NULL);
     if (r < 0)
@@ -236,8 +231,7 @@ PyDoc_STRVAR(Reader_get_timeout__doc__,
              "The return value must be converted to a relative timeout in\n"
              "milliseconds if it is to be used as an argument for poll().\n"
              "See man:sd_journal_get_timeout(3) for further discussion.");
-static PyObject* Reader_get_timeout(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_timeout(Reader *self, PyObject *args) {
     int r;
     uint64_t t;
 
@@ -259,8 +253,7 @@ PyDoc_STRVAR(Reader_get_timeout_ms__doc__,
              "Returns a timeout value suitable for usage in poll(), the value\n"
              "returned by .get_timeout() converted to relative ms, or -1 if\n"
              "no timeout is necessary.");
-static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args) {
     int r;
     uint64_t t;
 
@@ -278,8 +271,7 @@ PyDoc_STRVAR(Reader_close__doc__,
              "Free resources allocated by this Reader object.\n"
              "This method invokes sd_journal_close().\n"
              "See man:sd_journal_close(3).");
-static PyObject* Reader_close(Reader *self, PyObject *args)
-{
+static PyObject* Reader_close(Reader *self, PyObject *args) {
     assert(self);
     assert(!args);
 
@@ -298,8 +290,7 @@ PyDoc_STRVAR(Reader_get_usage__doc__,
              "of all hosts.\n\n"
              "This method invokes sd_journal_get_usage().\n"
              "See man:sd_journal_get_usage(3).");
-static PyObject* Reader_get_usage(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_usage(Reader *self, PyObject *args) {
     int r;
     uint64_t bytes;
 
@@ -316,8 +307,7 @@ PyDoc_STRVAR(Reader___enter____doc__,
              "__enter__() -> self\n\n"
              "Part of the context manager protocol.\n"
              "Returns self.\n");
-static PyObject* Reader___enter__(PyObject *self, PyObject *args)
-{
+static PyObject* Reader___enter__(PyObject *self, PyObject *args) {
     assert(self);
     assert(!args);
 
@@ -329,8 +319,7 @@ PyDoc_STRVAR(Reader___exit____doc__,
              "__exit__(type, value, traceback) -> None\n\n"
              "Part of the context manager protocol.\n"
              "Closes the journal.\n");
-static PyObject* Reader___exit__(Reader *self, PyObject *args)
-{
+static PyObject* Reader___exit__(Reader *self, PyObject *args) {
     return Reader_close(self, args);
 }
 
@@ -340,8 +329,7 @@ PyDoc_STRVAR(Reader_next__doc__,
              "Go to the next log entry. Optional skip value means to go to\n"
              "the `skip`\\-th log entry.\n"
              "Returns False if at end of file, True otherwise.");
-static PyObject* Reader_next(Reader *self, PyObject *args)
-{
+static PyObject* Reader_next(Reader *self, PyObject *args) {
     int64_t skip = 1LL;
     int r;
 
@@ -377,8 +365,7 @@ PyDoc_STRVAR(Reader_previous__doc__,
              "Go to the previous log entry. Optional skip value means to \n"
              "go to the `skip`\\-th previous log entry.\n"
              "Returns False if at start of file, True otherwise.");
-static PyObject* Reader_previous(Reader *self, PyObject *args)
-{
+static PyObject* Reader_previous(Reader *self, PyObject *args) {
     int64_t skip = 1LL;
     if (!PyArg_ParseTuple(args, "|L:previous", &skip))
         return NULL;
@@ -427,8 +414,7 @@ PyDoc_STRVAR(Reader_get__doc__,
              "get(str) -> str\n\n"
              "Return data associated with this key in current log entry.\n"
              "Throws KeyError is the data is not available.");
-static PyObject* Reader_get(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get(Reader *self, PyObject *args) {
     const char* field;
     const void* msg;
     size_t msg_len;
@@ -458,8 +444,7 @@ static PyObject* Reader_get(Reader *self, PyObject *args)
 PyDoc_STRVAR(Reader_get_all__doc__,
              "_get_all() -> dict\n\n"
              "Return dictionary of the current log entry.");
-static PyObject* Reader_get_all(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_all(Reader *self, PyObject *args) {
     PyObject *dict;
     const void *msg;
     size_t msg_len;
@@ -521,8 +506,7 @@ PyDoc_STRVAR(Reader_get_realtime__doc__,
              "in microseconds.\n\n"
              "Wraps sd_journal_get_realtime_usec().\n"
              "See man:sd_journal_get_realtime_usec(3).");
-static PyObject* Reader_get_realtime(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_realtime(Reader *self, PyObject *args) {
     uint64_t timestamp;
     int r;
 
@@ -544,8 +528,7 @@ PyDoc_STRVAR(Reader_get_monotonic__doc__,
              "as a tuple of time in microseconds and bootid.\n\n"
              "Wraps sd_journal_get_monotonic_usec().\n"
              "See man:sd_journal_get_monotonic_usec(3).");
-static PyObject* Reader_get_monotonic(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_monotonic(Reader *self, PyObject *args) {
     uint64_t timestamp;
     sd_id128_t id;
     PyObject *monotonic, *bootid, *tuple;
@@ -590,8 +573,7 @@ PyDoc_STRVAR(Reader_add_match__doc__,
              "fields are combined with logical AND, and matches of the same field\n"
              "are automatically combined with logical OR.\n"
              "Match is a string of the form \"FIELD=value\".");
-static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds)
-{
+static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) {
     char *match;
     int match_len, r;
     if (!PyArg_ParseTuple(args, "s#:add_match", &match, &match_len))
@@ -612,8 +594,7 @@ PyDoc_STRVAR(Reader_add_disjunction__doc__,
              "add_disjunction() or add_conjunction() and the next\n"
              "add_disjunction() or add_conjunction().\n\n"
              "See man:sd_journal_add_disjunction(3) for explanation.");
-static PyObject* Reader_add_disjunction(Reader *self, PyObject *args)
-{
+static PyObject* Reader_add_disjunction(Reader *self, PyObject *args) {
     int r;
     r = sd_journal_add_disjunction(self->j);
     set_error(r, NULL, NULL);
@@ -629,8 +610,7 @@ PyDoc_STRVAR(Reader_add_conjunction__doc__,
              "add_disjunction() or add_conjunction() and the next\n"
              "add_disjunction() or add_conjunction().\n\n"
              "See man:sd_journal_add_disjunction(3) for explanation.");
-static PyObject* Reader_add_conjunction(Reader *self, PyObject *args)
-{
+static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) {
     int r;
     r = sd_journal_add_conjunction(self->j);
     set_error(r, NULL, NULL);
@@ -643,8 +623,7 @@ static PyObject* Reader_add_conjunction(Reader *self, PyObject *args)
 PyDoc_STRVAR(Reader_flush_matches__doc__,
              "flush_matches() -> None\n\n"
              "Clear all current match filters.");
-static PyObject* Reader_flush_matches(Reader *self, PyObject *args)
-{
+static PyObject* Reader_flush_matches(Reader *self, PyObject *args) {
     sd_journal_flush_matches(self->j);
     Py_RETURN_NONE;
 }
@@ -655,8 +634,7 @@ PyDoc_STRVAR(Reader_seek_head__doc__,
              "Jump to the beginning of the journal.\n"
              "This method invokes sd_journal_seek_head().\n"
              "See man:sd_journal_seek_head(3).");
-static PyObject* Reader_seek_head(Reader *self, PyObject *args)
-{
+static PyObject* Reader_seek_head(Reader *self, PyObject *args) {
     int r;
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_head(self->j);
@@ -672,8 +650,7 @@ PyDoc_STRVAR(Reader_seek_tail__doc__,
              "Jump to the end of the journal.\n"
              "This method invokes sd_journal_seek_tail().\n"
              "See man:sd_journal_seek_tail(3).");
-static PyObject* Reader_seek_tail(Reader *self, PyObject *args)
-{
+static PyObject* Reader_seek_tail(Reader *self, PyObject *args) {
     int r;
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_tail(self->j);
@@ -688,8 +665,7 @@ PyDoc_STRVAR(Reader_seek_realtime__doc__,
              "seek_realtime(realtime) -> None\n\n"
              "Seek to nearest matching journal entry to `realtime`. Argument\n"
              "`realtime` in specified in seconds.");
-static PyObject* Reader_seek_realtime(Reader *self, PyObject *args)
-{
+static PyObject* Reader_seek_realtime(Reader *self, PyObject *args) {
     uint64_t timestamp;
     int r;
 
@@ -711,8 +687,7 @@ PyDoc_STRVAR(Reader_seek_monotonic__doc__,
              "`monotonic` is an timestamp from boot in microseconds.\n"
              "Argument `bootid` is a string representing which boot the\n"
              "monotonic time is reference to. Defaults to current bootid.");
-static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args)
-{
+static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args) {
     char *bootid = NULL;
     uint64_t timestamp;
     sd_id128_t id;
@@ -751,8 +726,7 @@ PyDoc_STRVAR(Reader_process__doc__,
              "entries have been added to the end of the journal; and\n"
              "INVALIDATE if journal files have been added or removed.\n\n"
              "See man:sd_journal_process(3) for further discussion.");
-static PyObject* Reader_process(Reader *self, PyObject *args)
-{
+static PyObject* Reader_process(Reader *self, PyObject *args) {
     int r;
 
     assert(!args);
@@ -777,8 +751,7 @@ PyDoc_STRVAR(Reader_wait__doc__,
              "entries have been added to the end of the journal; and\n"
              "INVALIDATE if journal files have been added or removed.\n\n"
              "See man:sd_journal_wait(3) for further discussion.");
-static PyObject* Reader_wait(Reader *self, PyObject *args)
-{
+static PyObject* Reader_wait(Reader *self, PyObject *args) {
     int r;
     int64_t timeout;
 
@@ -798,8 +771,7 @@ static PyObject* Reader_wait(Reader *self, PyObject *args)
 PyDoc_STRVAR(Reader_seek_cursor__doc__,
              "seek_cursor(cursor) -> None\n\n"
              "Seek to journal entry by given unique reference `cursor`.");
-static PyObject* Reader_seek_cursor(Reader *self, PyObject *args)
-{
+static PyObject* Reader_seek_cursor(Reader *self, PyObject *args) {
     const char *cursor;
     int r;
 
@@ -819,8 +791,7 @@ PyDoc_STRVAR(Reader_get_cursor__doc__,
              "get_cursor() -> str\n\n"
              "Return a cursor string for the current journal entry.\n\n"
              "Wraps sd_journal_get_cursor(). See man:sd_journal_get_cursor(3).");
-static PyObject* Reader_get_cursor(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_cursor(Reader *self, PyObject *args) {
     _cleanup_free_ char *cursor = NULL;
     int r;
 
@@ -839,8 +810,7 @@ PyDoc_STRVAR(Reader_test_cursor__doc__,
              "test_cursor(str) -> bool\n\n"
              "Test whether the cursor string matches current journal entry.\n\n"
              "Wraps sd_journal_test_cursor(). See man:sd_journal_test_cursor(3).");
-static PyObject* Reader_test_cursor(Reader *self, PyObject *args)
-{
+static PyObject* Reader_test_cursor(Reader *self, PyObject *args) {
     const char *cursor;
     int r;
 
@@ -862,8 +832,7 @@ PyDoc_STRVAR(Reader_query_unique__doc__,
              "query_unique(field) -> a set of values\n\n"
              "Return a set of unique values appearing in journal for the\n"
              "given `field`. Note this does not respect any journal matches.");
-static PyObject* Reader_query_unique(Reader *self, PyObject *args)
-{
+static PyObject* Reader_query_unique(Reader *self, PyObject *args) {
     char *query;
     int r;
     const void *uniq;
@@ -904,8 +873,7 @@ PyDoc_STRVAR(Reader_get_catalog__doc__,
              "and KeyError is the id is specified, but hasn't been found\n"
              "in the catalog.\n\n"
              "Wraps man:sd_journal_get_catalog(3).");
-static PyObject* Reader_get_catalog(Reader *self, PyObject *args)
-{
+static PyObject* Reader_get_catalog(Reader *self, PyObject *args) {
     int r;
     _cleanup_free_ char *msg = NULL;
 
@@ -941,8 +909,7 @@ PyDoc_STRVAR(get_catalog__doc__,
              "get_catalog(id128) -> str\n\n"
              "Retrieve a message catalog entry for the given id.\n"
              "Wraps man:sd_journal_get_catalog_for_message_id(3).");
-static PyObject* get_catalog(PyObject *self, PyObject *args)
-{
+static PyObject* get_catalog(PyObject *self, PyObject *args) {
     int r;
     char *id_ = NULL;
     sd_id128_t id;
@@ -973,8 +940,7 @@ PyDoc_STRVAR(data_threshold__doc__,
              "Fields longer than this will be truncated to the threshold size.\n"
              "Defaults to 64Kb.");
 
-static PyObject* Reader_get_data_threshold(Reader *self, void *closure)
-{
+static PyObject* Reader_get_data_threshold(Reader *self, void *closure) {
     size_t cvalue;
     int r;
 
@@ -985,8 +951,7 @@ static PyObject* Reader_get_data_threshold(Reader *self, void *closure)
     return long_FromSize_t(cvalue);
 }
 
-static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure)
-{
+static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure) {
     int r;
     if (value == NULL) {
         PyErr_SetString(PyExc_AttributeError, "Cannot delete data threshold");
@@ -1003,8 +968,7 @@ static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closur
 
 PyDoc_STRVAR(closed__doc__,
              "True iff journal is closed");
-static PyObject* Reader_get_closed(Reader *self, void *closure)
-{
+static PyObject* Reader_get_closed(Reader *self, void *closure) {
     return PyBool_FromLong(self->j == NULL);
 }
 
diff --git a/src/python-systemd/login.c b/src/python-systemd/login.c
index dd2edbca00..43f781922d 100644
--- a/src/python-systemd/login.c
+++ b/src/python-systemd/login.c
@@ -140,8 +140,7 @@ typedef struct {
 } Monitor;
 static PyTypeObject MonitorType;
 
-static void Monitor_dealloc(Monitor* self)
-{
+static void Monitor_dealloc(Monitor* self) {
         sd_login_monitor_unref(self->monitor);
         Py_TYPE(self)->tp_free((PyObject*)self);
 }
@@ -153,8 +152,7 @@ PyDoc_STRVAR(Monitor__doc__,
              "descriptor which can be integrated in an external event loop.\n"
              "See man:sd_login_monitor_new(3) for the details about what\n"
              "can be monitored.");
-static int Monitor_init(Monitor *self, PyObject *args, PyObject *keywds)
-{
+static int Monitor_init(Monitor *self, PyObject *args, PyObject *keywds) {
         const char *category = NULL;
         int r;
 
@@ -175,8 +173,7 @@ PyDoc_STRVAR(Monitor_fileno__doc__,
              "fileno() -> int\n\n"
              "Get a file descriptor to poll for events.\n"
              "This method wraps sd_login_monitor_get_fd(3).");
-static PyObject* Monitor_fileno(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor_fileno(Monitor *self, PyObject *args) {
         int fd = sd_login_monitor_get_fd(self->monitor);
         set_error(fd, NULL, NULL);
         if (fd < 0)
@@ -190,8 +187,7 @@ PyDoc_STRVAR(Monitor_get_events__doc__,
              "Returns a mask of poll() events to wait for on the file\n"
              "descriptor returned by .fileno().\n\n"
              "See man:sd_login_monitor_get_events(3) for further discussion.");
-static PyObject* Monitor_get_events(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor_get_events(Monitor *self, PyObject *args) {
         int r = sd_login_monitor_get_events(self->monitor);
         set_error(r, NULL, NULL);
         if (r < 0)
@@ -208,8 +204,7 @@ PyDoc_STRVAR(Monitor_get_timeout__doc__,
              "The return value must be converted to a relative timeout in\n"
              "milliseconds if it is to be used as an argument for poll().\n"
              "See man:sd_login_monitor_get_timeout(3) for further discussion.");
-static PyObject* Monitor_get_timeout(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor_get_timeout(Monitor *self, PyObject *args) {
         int r;
         uint64_t t;
 
@@ -231,8 +226,7 @@ PyDoc_STRVAR(Monitor_get_timeout_ms__doc__,
              "Returns a timeout value suitable for usage in poll(), the value\n"
              "returned by .get_timeout() converted to relative ms, or -1 if\n"
              "no timeout is necessary.");
-static PyObject* Monitor_get_timeout_ms(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor_get_timeout_ms(Monitor *self, PyObject *args) {
         int r;
         uint64_t t;
 
@@ -250,8 +244,7 @@ PyDoc_STRVAR(Monitor_close__doc__,
              "Free resources allocated by this Monitor object.\n"
              "This method invokes sd_login_monitor_unref().\n"
              "See man:sd_login_monitor_unref(3).");
-static PyObject* Monitor_close(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor_close(Monitor *self, PyObject *args) {
         assert(self);
         assert(!args);
 
@@ -266,8 +259,7 @@ PyDoc_STRVAR(Monitor_flush__doc__,
              "Reset the wakeup state of the monitor object.\n"
              "This method invokes sd_login_monitor_flush().\n"
              "See man:sd_login_monitor_flush(3).");
-static PyObject* Monitor_flush(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor_flush(Monitor *self, PyObject *args) {
         assert(self);
         assert(!args);
 
@@ -282,8 +274,7 @@ PyDoc_STRVAR(Monitor___enter____doc__,
              "__enter__() -> self\n\n"
              "Part of the context manager protocol.\n"
              "Returns self.\n");
-static PyObject* Monitor___enter__(PyObject *self, PyObject *args)
-{
+static PyObject* Monitor___enter__(PyObject *self, PyObject *args) {
         assert(self);
         assert(!args);
 
@@ -296,8 +287,7 @@ PyDoc_STRVAR(Monitor___exit____doc__,
              "__exit__(type, value, traceback) -> None\n\n"
              "Part of the context manager protocol.\n"
              "Closes the monitor..\n");
-static PyObject* Monitor___exit__(Monitor *self, PyObject *args)
-{
+static PyObject* Monitor___exit__(Monitor *self, PyObject *args) {
         return Monitor_close(self, args);
 }
 
diff --git a/src/shared/ioprio.h b/src/shared/ioprio.h
index 9800fc2553..e5c71d0043 100644
--- a/src/shared/ioprio.h
+++ b/src/shared/ioprio.h
@@ -44,13 +44,11 @@ enum {
         IOPRIO_WHO_USER,
 };
 
-static inline int ioprio_set(int which, int who, int ioprio)
-{
+static inline int ioprio_set(int which, int who, int ioprio) {
         return syscall(__NR_ioprio_set, which, who, ioprio);
 }
 
-static inline int ioprio_get(int which, int who)
-{
+static inline int ioprio_get(int which, int who) {
         return syscall(__NR_ioprio_get, which, who);
 }
 
diff --git a/src/shared/linux/auto_dev-ioctl.h b/src/shared/linux/auto_dev-ioctl.h
index 850f39b33e..aeaeb3ea7a 100644
--- a/src/shared/linux/auto_dev-ioctl.h
+++ b/src/shared/linux/auto_dev-ioctl.h
@@ -118,8 +118,7 @@ struct autofs_dev_ioctl {
 	char path[0];
 };
 
-static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in)
-{
+static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in) {
 	memset(in, 0, sizeof(struct autofs_dev_ioctl));
 	in->ver_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR;
 	in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR;
diff --git a/src/shared/strxcpyx.c b/src/shared/strxcpyx.c
index 3cb04b25cd..6542c0abf5 100644
--- a/src/shared/strxcpyx.c
+++ b/src/shared/strxcpyx.c
@@ -29,8 +29,7 @@
 #include <string.h>
 #include "strxcpyx.h"
 
-size_t strpcpy(char **dest, size_t size, const char *src)
-{
+size_t strpcpy(char **dest, size_t size, const char *src) {
         size_t len;
 
         len = strlen(src);
@@ -48,8 +47,7 @@ size_t strpcpy(char **dest, size_t size, const char *src)
         return size;
 }
 
-size_t strpcpyf(char **dest, size_t size, const char *src, ...)
-{
+size_t strpcpyf(char **dest, size_t size, const char *src, ...) {
         va_list va;
         int i;
 
@@ -67,8 +65,7 @@ size_t strpcpyf(char **dest, size_t size, const char *src, ...)
         return size;
 }
 
-size_t strpcpyl(char **dest, size_t size, const char *src, ...)
-{
+size_t strpcpyl(char **dest, size_t size, const char *src, ...) {
         va_list va;
 
         va_start(va, src);
@@ -80,8 +77,7 @@ size_t strpcpyl(char **dest, size_t size, const char *src, ...)
         return size;
 }
 
-size_t strscpy(char *dest, size_t size, const char *src)
-{
+size_t strscpy(char *dest, size_t size, const char *src) {
         char *s;
 
         s = dest;
diff --git a/src/shared/util.c b/src/shared/util.c
index b4ed2c407c..efd3468fb6 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5379,7 +5379,7 @@ bool is_locale_utf8(void) {
                 goto out;
         }
 
-        if(streq(set, "UTF-8")) {
+        if (streq(set, "UTF-8")) {
                 cached_answer = true;
                 goto out;
         }
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 5dcefd7f18..f3db6bfdbf 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1152,7 +1152,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
 
                 for (i = level - 1; i >= 0; i--) {
                         len += 2;
-                        if(len > max_len - 3 && !arg_full) {
+                        if (len > max_len - 3 && !arg_full) {
                                 printf("%s...\n",max_len % 2 ? "" : " ");
                                 return 0;
                         }
@@ -1160,7 +1160,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
                 }
                 len += 2;
 
-                if(len > max_len - 3 && !arg_full) {
+                if (len > max_len - 3 && !arg_full) {
                         printf("%s...\n",max_len % 2 ? "" : " ");
                         return 0;
                 }
@@ -1174,7 +1174,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
         }
 
         n = ellipsize(name, max_len-len, 100);
-        if(!n)
+        if (!n)
                 return log_oom();
 
         printf("%s\n", n);
@@ -1334,7 +1334,7 @@ static int list_dependencies_one(
 
                 if (arg_all || unit_name_to_type(*c) == UNIT_TARGET) {
                        r = list_dependencies_one(bus, *c, level + 1, &u, (branches << 1) | (c[1] == NULL ? 0 : 1));
-                       if(r < 0)
+                       if (r < 0)
                                return r;
                 }
         }
@@ -1814,7 +1814,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) {
                 return log_oom();
 
         while (!set_isempty(s)) {
-                for(;;) {
+                for (;;) {
                         r = sd_bus_process(bus, NULL);
                         if (r < 0)
                                 return r;
@@ -4916,7 +4916,7 @@ static int help_types(void) {
         const char *t;
 
         puts("Available unit types:");
-        for(i = 0; i < _UNIT_TYPE_MAX; i++) {
+        for (i = 0; i < _UNIT_TYPE_MAX; i++) {
                 t = unit_type_to_string(i);
                 if (t)
                         puts(t);
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 9c06bc1cfd..7ed4e14701 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -36,14 +36,12 @@
 
 static void log_fn(struct udev *udev,
                    int priority, const char *file, int line, const char *fn,
-                   const char *format, va_list args)
-{
+                   const char *format, va_list args) {
         printf("test-libudev: %s %s:%d ", fn, file, line);
         vprintf(format, args);
 }
 
-static void print_device(struct udev_device *device)
-{
+static void print_device(struct udev_device *device) {
         const char *str;
         dev_t devnum;
         int count;
@@ -116,8 +114,7 @@ static void print_device(struct udev_device *device)
         printf("\n");
 }
 
-static int test_device(struct udev *udev, const char *syspath)
-{
+static int test_device(struct udev *udev, const char *syspath) {
         _cleanup_udev_device_unref_ struct udev_device *device;
 
         printf("looking at device: %s\n", syspath);
@@ -131,8 +128,7 @@ static int test_device(struct udev *udev, const char *syspath)
         return 0;
 }
 
-static int test_device_parents(struct udev *udev, const char *syspath)
-{
+static int test_device_parents(struct udev *udev, const char *syspath) {
         _cleanup_udev_device_unref_ struct udev_device *device;
         struct udev_device *device_parent;
 
@@ -158,8 +154,7 @@ static int test_device_parents(struct udev *udev, const char *syspath)
         return 0;
 }
 
-static int test_device_devnum(struct udev *udev)
-{
+static int test_device_devnum(struct udev *udev) {
         dev_t devnum = makedev(1, 3);
         struct udev_device *device;
 
@@ -172,8 +167,7 @@ static int test_device_devnum(struct udev *udev)
         return 0;
 }
 
-static int test_device_subsys_name(struct udev *udev)
-{
+static int test_device_subsys_name(struct udev *udev) {
         struct udev_device *device;
 
         printf("looking up device: 'block':'sda'\n");
@@ -206,8 +200,7 @@ static int test_device_subsys_name(struct udev *udev)
         return 0;
 }
 
-static int test_enumerate_print_list(struct udev_enumerate *enumerate)
-{
+static int test_enumerate_print_list(struct udev_enumerate *enumerate) {
         struct udev_list_entry *list_entry;
         int count = 0;
 
@@ -228,8 +221,7 @@ static int test_enumerate_print_list(struct udev_enumerate *enumerate)
         return count;
 }
 
-static int test_monitor(struct udev *udev)
-{
+static int test_monitor(struct udev *udev) {
         struct udev_monitor *udev_monitor = NULL;
         int fd_ep;
         int fd_udev = -1;
@@ -308,8 +300,7 @@ out:
         return 0;
 }
 
-static int test_queue(struct udev *udev)
-{
+static int test_queue(struct udev *udev) {
         struct udev_queue *udev_queue;
         unsigned long long int seqnum;
         struct udev_list_entry *list_entry;
@@ -347,8 +338,7 @@ static int test_queue(struct udev *udev)
         return 0;
 }
 
-static int test_enumerate(struct udev *udev, const char *subsystem)
-{
+static int test_enumerate(struct udev *udev, const char *subsystem) {
         struct udev_enumerate *udev_enumerate;
 
         printf("enumerate '%s'\n", subsystem == NULL ? "<all>" : subsystem);
@@ -443,8 +433,7 @@ static void test_hwdb(struct udev *udev, const char *modalias) {
         assert(hwdb == NULL);
 }
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         struct udev *udev = NULL;
         static const struct option options[] = {
                 { "syspath", required_argument, NULL, 'p' },
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index e9b6c033fd..3334e0bf6c 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -85,8 +85,7 @@ static void test_strbuf(void) {
         strbuf_cleanup(sb);
 }
 
-int main(int argc, const char *argv[])
-{
+int main(int argc, const char *argv[]) {
         test_strbuf();
 
         return 0;
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 17825f12b4..bab64c9015 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -81,8 +81,7 @@ out:
 }
 
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         _cleanup_udev_unref_ struct udev *udev = NULL;
         _cleanup_udev_event_unref_ struct udev_event *event = NULL;
         _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 738954c728..f25afa60c7 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -334,7 +334,7 @@ static int get_mac(struct udev_device *device, bool want_random, struct ether_ad
 
         srandom(seed);
 
-        for(i = 0; i < ETH_ALEN; i++) {
+        for (i = 0; i < ETH_ALEN; i++) {
                 mac->ether_addr_octet[i] = random();
         }
 
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 9ae8f08ccf..b859a6b9d5 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -159,7 +159,7 @@ static bool is_pci_multifunction(struct udev_device *dev) {
         if ((config[PCI_HEADER_TYPE] & 0x80) != 0)
                 multi = true;
 out:
-        if(f)
+        if (f)
                 fclose(f);
         return multi;
 }
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 9e503001bb..4bb0ceafe7 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -359,7 +359,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
         udev_ctrl_connection_ref(conn);
 
         /* wait for the incoming message */
-        for(;;) {
+        for (;;) {
                 struct pollfd pfd[1];
                 int r;
 
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 9154700bfa..f793e57712 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -431,7 +431,7 @@ static void dump_rules(struct udev_rules *rules)
                   rules->token_cur * sizeof(struct token),
                   rules->buf_count,
                   rules->buf_cur);
-        for(i = 0; i < rules->token_cur; i++)
+        for (i = 0; i < rules->token_cur; i++)
                 dump_token(rules, &rules->tokens[i]);
 }
 #else