diff --git a/src/btrfs.c b/src/btrfs.c
index 3f86e35a..be9d72e4 100644
--- a/src/btrfs.c
+++ b/src/btrfs.c
@@ -50,7 +50,7 @@ is_btrfs(const char *path)
 
   return buf.f_type == BTRFS_SUPER_MAGIC;
 #else
-  (void)path;
+  (void) path;
   return false;
 #endif
 }
@@ -116,9 +116,9 @@ do_btrfs_clone(const char *source, const char *dest, int *save_errno)
 
   return 0;
 #else
-  (void)source;
-  (void)dest;
-  (void)save_errno;
+  (void) source;
+  (void) dest;
+  (void) save_errno;
   return 0;
 #endif
 }
diff --git a/src/messages_rmw.h b/src/messages_rmw.h
index 32d741f3..e2d9d069 100644
--- a/src/messages_rmw.h
+++ b/src/messages_rmw.h
@@ -33,7 +33,7 @@ void print_msg_warn(void);
 
 void open_err(const char *filename, const char *function_name);
 
-int close_file(FILE **fp, const char *filename, const char *function_name);
+int close_file(FILE ** fp, const char *filename, const char *function_name);
 
 void display_dot_trashinfo_error(const char *dti);
 
@@ -43,8 +43,7 @@ void msg_err_close_dir(const char *dir, const char *func, const int line);
 
 void msg_err_open_dir(const char *dir, const char *func, const int line);
 
-void
-msg_err_rename(const char *src_file, const char *dest_file);
+void msg_err_rename(const char *src_file, const char *dest_file);
 
 void msg_err_fatal_fprintf(const char *func);
 
diff --git a/src/trashinfo_rmw.c b/src/trashinfo_rmw.c
index d5d50521..7cfa4793 100644
--- a/src/trashinfo_rmw.c
+++ b/src/trashinfo_rmw.c
@@ -86,7 +86,8 @@ create_trashinfo(rmw_target *st_f_props, st_waste *waste_curr,
       return close_file(&fp, final_info_dest, __func__);
 
     char *escaped_path_ptr = escaped_path;
-    if (waste_curr->media_root != NULL && (waste_curr->dev_num == st_f_props->dev_num))
+    if (waste_curr->media_root != NULL
+        && (waste_curr->dev_num == st_f_props->dev_num))
     {
       escaped_path_ptr = &escaped_path[strlen(waste_curr->media_root)];
       if (*escaped_path_ptr == '/')