diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 0f25e267..7d1fc848 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -59,8 +59,8 @@ enum tap_event {
  */
 
 static inline const char*
-tap_state_to_str(enum tp_tap_state state) {
-
+tap_state_to_str(enum tp_tap_state state)
+{
 	switch(state) {
 	CASE_RETURN_STRING(TAP_STATE_IDLE);
 	CASE_RETURN_STRING(TAP_STATE_HOLD);
@@ -82,8 +82,8 @@ tap_state_to_str(enum tp_tap_state state) {
 }
 
 static inline const char*
-tap_event_to_str(enum tap_event event) {
-
+tap_event_to_str(enum tap_event event)
+{
 	switch(event) {
 	CASE_RETURN_STRING(TAP_EVENT_TOUCH);
 	CASE_RETURN_STRING(TAP_EVENT_MOTION);
diff --git a/test/build-pedantic.c b/test/build-pedantic.c
index 920fc4ab..f602127d 100644
--- a/test/build-pedantic.c
+++ b/test/build-pedantic.c
@@ -3,6 +3,7 @@
 /* This is a build-test only */
 
 int
-main(void) {
+main(void)
+{
 	return 0;
 }
diff --git a/test/log.c b/test/log.c
index a56af151..139c0020 100644
--- a/test/log.c
+++ b/test/log.c
@@ -140,7 +140,8 @@ START_TEST(log_priority)
 }
 END_TEST
 
-int main (int argc, char **argv) {
+int main (int argc, char **argv)
+{
 	litest_add_no_device("log:defaults", log_default_priority);
 	litest_add_no_device("log:logging", log_handler_invoked);
 	litest_add_no_device("log:logging", log_handler_NULL);
diff --git a/test/misc.c b/test/misc.c
index 829da7d3..e9d54622 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -583,7 +583,8 @@ START_TEST(trackpoint_accel_parser)
 }
 END_TEST
 
-int main (int argc, char **argv) {
+int main (int argc, char **argv)
+{
 	litest_add_no_device("events:conversion", event_conversion_device_notify);
 	litest_add_for_device("events:conversion", event_conversion_pointer, LITEST_MOUSE);
 	litest_add_for_device("events:conversion", event_conversion_pointer, LITEST_MOUSE);
diff --git a/test/pointer.c b/test/pointer.c
index 1dde354d..a0f862b8 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -1253,8 +1253,8 @@ START_TEST(middlebutton_default_touchpad)
 }
 END_TEST
 
-int main (int argc, char **argv) {
-
+int main (int argc, char **argv)
+{
 	litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
 	litest_add("pointer:motion", pointer_motion_absolute, LITEST_ABSOLUTE, LITEST_ANY);
 	litest_add("pointer:motion", pointer_motion_unaccel, LITEST_RELATIVE, LITEST_ANY);
diff --git a/test/touchpad.c b/test/touchpad.c
index 830e5890..094f671e 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -4116,8 +4116,8 @@ START_TEST(touchpad_trackpoint_no_trackpoint)
 }
 END_TEST
 
-int main(int argc, char **argv) {
-
+int main(int argc, char **argv)
+{
 	litest_add("touchpad:motion", touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY);
 	litest_add("touchpad:motion", touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
 
diff --git a/test/trackpoint.c b/test/trackpoint.c
index 2708bad2..ac6173e4 100644
--- a/test/trackpoint.c
+++ b/test/trackpoint.c
@@ -130,8 +130,8 @@ START_TEST(trackpoint_scroll_source)
 }
 END_TEST
 
-int main(int argc, char **argv) {
-
+int main(int argc, char **argv)
+{
 	litest_add("trackpoint:middlebutton", trackpoint_middlebutton, LITEST_POINTINGSTICK, LITEST_ANY);
 	litest_add("trackpoint:middlebutton", trackpoint_middlebutton_noscroll, LITEST_POINTINGSTICK, LITEST_ANY);
 	litest_add("trackpoint:scroll", trackpoint_scroll, LITEST_POINTINGSTICK, LITEST_ANY);
diff --git a/tools/ptraccel-debug.c b/tools/ptraccel-debug.c
index d00e8f37..fdd8490e 100644
--- a/tools/ptraccel-debug.c
+++ b/tools/ptraccel-debug.c
@@ -178,7 +178,8 @@ usage(void)
 }
 
 int
-main(int argc, char **argv) {
+main(int argc, char **argv)
+{
 	struct motion_filter *filter;
 	double step = 0.1,
 	       max_dx = 10;