diff --git a/files.c b/files.c
index 6eb72826a..dfe55da00 100644
--- a/files.c
+++ b/files.c
@@ -144,7 +144,7 @@ void show_saved_files(void)
 /*
  * The gen_id thing is used to optimize the comparison of shared files.
  * If two files have different gen_ids, then they are different for sure.
- * If it matches, we don't know it and have to call sys_kcmp(). 
+ * If it matches, we don't know it and have to call sys_kcmp().
  *
  * The kcmp-ids.c engine does this trick, see comments in it for more info.
  */
diff --git a/fsnotify.c b/fsnotify.c
index 55647a4c9..bce4a8d3a 100644
--- a/fsnotify.c
+++ b/fsnotify.c
@@ -430,8 +430,8 @@ static struct fsnotify_file_info *find_inotify_info(unsigned id)
 
 	if (last && last->ife->id == id) {
 		/*
-		 * An optimization for clean dump image -- criu puts 
-		 * wd-s for one inotify in one row, thus sometimes 
+		 * An optimization for clean dump image -- criu puts
+		 * wd-s for one inotify in one row, thus sometimes
 		 * we can avoid scanning the inotify_info_head.
 		 */
 		pr_debug("\t\tlast ify for %u found\n", id);
diff --git a/include/rst-malloc.h b/include/rst-malloc.h
index df854e6e1..75d0d3f95 100644
--- a/include/rst-malloc.h
+++ b/include/rst-malloc.h
@@ -45,7 +45,7 @@ enum {
  * Disables SHARED and SHREMAP allocations, turns on PRIVATE
  */
 extern void rst_mem_switch_to_private(void);
-/* 
+/*
  * Reports a cookie of a current shared buffer position, that
  * can later be used in rst_mem_cpos() to find out the object
  * pointer.
diff --git a/mem.c b/mem.c
index 62fdfc229..67d249ec3 100644
--- a/mem.c
+++ b/mem.c
@@ -361,7 +361,7 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
 	}
 
 	debug_show_page_pipe(pp);
-	
+
 	/*
 	 * Step 2 -- grab pages into page-pipe
 	 */
diff --git a/mount.c b/mount.c
index 40d0cc7a4..3b3510103 100644
--- a/mount.c
+++ b/mount.c
@@ -643,7 +643,7 @@ out:
 }
 
 static struct fstype fstypes[] = {
-	{ 
+	{
 		.name = "unsupported",
 		.code = FSTYPE__UNSUPPORTED,
 	}, {
diff --git a/namespaces.c b/namespaces.c
index a9eb5275c..5d7f6a2c5 100644
--- a/namespaces.c
+++ b/namespaces.c
@@ -269,7 +269,7 @@ static int open_ns_fd(struct file_desc *d)
 	if (!nd || !item) {
 		pr_err("Can't find suitable NS ID for %#x\n", nfi->nfe->ns_id);
 		return -1;
-	} 
+	}
 
 	if (nd->cflag != nfi->nfe->ns_cflag) {
 		pr_err("Clone flag mismatch for %#x\n", nfi->nfe->ns_id);
diff --git a/pie/restorer.c b/pie/restorer.c
index 899bc6522..96f49f8e2 100644
--- a/pie/restorer.c
+++ b/pie/restorer.c
@@ -911,7 +911,7 @@ long __export_restore_task(struct task_restore_args *args)
 
 	rst_tcp_socks_all(args);
 
-	/* 
+	/*
 	 * Writing to last-pid is CAP_SYS_ADMIN protected,
 	 * turning off TCP repair is CAP_SYS_NED_ADMIN protected,
 	 * thus restore* creds _after_ all of the above.
diff --git a/rst-malloc.c b/rst-malloc.c
index 08ba7de7f..aecefea30 100644
--- a/rst-malloc.c
+++ b/rst-malloc.c
@@ -100,7 +100,7 @@ static int grow_private(struct rst_mem_type_s *t, unsigned long size)
 }
 
 static struct rst_mem_type_s rst_mems[RST_MEM_TYPES] = {
-	[RM_SHARED] = { 
+	[RM_SHARED] = {
 		.grow = grow_shared,
 		.remapable = false,
 		.enabled = true,
diff --git a/security.c b/security.c
index 27eaf2ed9..42dad8d02 100644
--- a/security.c
+++ b/security.c
@@ -11,9 +11,9 @@
 static unsigned int cr_uid, cr_gid;
 
 /*
- * Setup what user is requesting for dump (via rpc or using 
- * suid bit on crtools). Later we would deny to dump/restore 
- * a task, to which the original user doesn't have the direct 
+ * Setup what user is requesting for dump (via rpc or using
+ * suid bit on crtools). Later we would deny to dump/restore
+ * a task, to which the original user doesn't have the direct
  * access to. (Or implement some trickier security policy).
  */
 
diff --git a/test/zdtm.sh b/test/zdtm.sh
index f86dd8bcf..7be966704 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -653,7 +653,7 @@ Options:
 	-g : Generate executables only
 	-n : Batch test
 	-r : Run test with specified name directly without match or check
-	-v : Verbose mode 
+	-v : Verbose mode
 EOF
 }
 
diff --git a/test/zdtm/live/static/sigpending.c b/test/zdtm/live/static/sigpending.c
index c52f44add..6a3395c14 100644
--- a/test/zdtm/live/static/sigpending.c
+++ b/test/zdtm/live/static/sigpending.c
@@ -1,4 +1,4 @@
-#define _GNU_SOURCE 
+#define _GNU_SOURCE
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/test/zdtm/live/static/uptime_grow.c b/test/zdtm/live/static/uptime_grow.c
index 670c0627c..e3d772c1a 100644
--- a/test/zdtm/live/static/uptime_grow.c
+++ b/test/zdtm/live/static/uptime_grow.c
@@ -10,7 +10,7 @@ const char *test_author = "Evgeny Antysev <eantyshev@parallels.com>";
   (((a)->tv_sec == (b)->tv_sec) ? \
    ((a)->tv_nsec >= (b)->tv_nsec) : \
    ((a)->tv_sec > (b)->tv_sec))
- 
+
 int main(int argc, char **argv)
 {
 	struct timespec tm_old, tm, ts;