diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 7b8114e1..dc7e2941 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -232,7 +232,7 @@ void copyright(void)
 }
 
 /**
- * license - print licese statement
+ * license - print license statement
  */
 void license(void)
 {
@@ -1030,7 +1030,8 @@ void deallocate_scattered_clusters(const runlist *rl)
 	}
 }
 
-/*
+/**
+ * allocate_scattered_clusters
  * Allocate @clusters and create a runlist of the allocated clusters.
  *
  * Return the allocated runlist. Caller has to free the runlist when finished
@@ -1041,9 +1042,6 @@ void deallocate_scattered_clusters(const runlist *rl)
  * TODO: We should be returning the size as well, but for mkntfs this is not
  * necessary.
  */
-/**
- * allocate_scattered_clusters
- */
 runlist *allocate_scattered_clusters(s64 clusters)
 {
 	runlist *rl = NULL, *rlt;
@@ -1596,15 +1594,6 @@ err_out:
 	return err;
 }
 
-/**
- * time2ntfs
- */
-s64 time2ntfs(s64 time)
-{
-	return cpu_to_le64((time + (s64)(369 * 365 + 89) * 24 * 3600)
-			* 10000000);
-}
-
 /**
  * add_attr_std_info
  * Return 0 on success or -errno on error.
@@ -1614,7 +1603,7 @@ int add_attr_std_info(MFT_RECORD *m, const FILE_ATTR_FLAGS flags)
 	STANDARD_INFORMATION si;
 	int err;
 
-	si.creation_time = time2ntfs(time(NULL));
+	si.creation_time = utc2ntfs(time(NULL));
 	si.last_data_change_time = si.creation_time;
 	si.last_mft_change_time = si.creation_time;
 	si.last_access_time = si.creation_time;
@@ -2384,7 +2373,7 @@ int create_hardlink(INDEX_BLOCK *index, const MFT_REF ref_parent,
 	fn->parent_directory = ref_parent;
 	// FIXME: Is this correct? Or do we have to copy the creation_time
 	// from the std info?
-	fn->creation_time = time2ntfs(time(NULL));
+	fn->creation_time = utc2ntfs(time(NULL));
 	fn->last_data_change_time = fn->creation_time;
 	fn->last_mft_change_time = fn->creation_time;
 	fn->last_access_time = fn->creation_time;
diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c
index bbc806f2..7da52ff1 100644
--- a/ntfsprogs/ntfslabel.c
+++ b/ntfsprogs/ntfslabel.c
@@ -66,7 +66,7 @@ void version (void)
 	printf ("    2002      Matthew J. Fanto\n");
 	printf ("    2002      Anton Altaparmakov\n");
 	printf ("    2002-2003 Richard Russon\n");
-	printf ("\n%s\n\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
+	printf ("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
 }
 
 /**
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index 5d5307a5..6df3c606 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <locale.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -37,7 +36,6 @@
 #include <time.h>
 #include <limits.h>
 #include <regex.h>
-#include <libintl.h>
 #include <time.h>
 #include <stdarg.h>
 #include <utime.h>
diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c
index 2549d948..194e1c36 100644
--- a/ntfsprogs/ntfswipe.c
+++ b/ntfsprogs/ntfswipe.c
@@ -25,8 +25,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <locale.h>
-#include <libintl.h>
 #include <stdarg.h>
 #include <getopt.h>
 #include <string.h>
diff --git a/ntfsprogs/sd.c b/ntfsprogs/sd.c
index 16115b4e..7db46eff 100644
--- a/ntfsprogs/sd.c
+++ b/ntfsprogs/sd.c
@@ -26,7 +26,6 @@
  *
  * Do NOT free *@sd_val as it is static memory. This also means that you can
  * only use *@sd_val until the next call to this function.
- *
  */
 void init_system_file_sd(int sys_file_no, char **sd_val, int *sd_val_len)
 {