diff --git a/fsck/dict.c b/fsck/dict.c
index bb7600c..5b875be 100644
--- a/fsck/dict.c
+++ b/fsck/dict.c
@@ -20,7 +20,6 @@
 
 #define DICT_NODEBUG
 
-#include "config.h"
 #include <stdlib.h>
 #include <stddef.h>
 #ifdef DICT_NODEBUG
diff --git a/fsck/mkquota.c b/fsck/mkquota.c
index c419a0f..d18141e 100644
--- a/fsck/mkquota.c
+++ b/fsck/mkquota.c
@@ -4,7 +4,7 @@
  * Aditya Kali <adityakali@google.com>
  * Hyojun Kim <hyojun@google.com> - Ported to f2fs-tools
  */
-#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/fsck/quotaio.c b/fsck/quotaio.c
index a3815b0..d024752 100644
--- a/fsck/quotaio.c
+++ b/fsck/quotaio.c
@@ -6,7 +6,6 @@
  * Hyojun Kim <hyojun@google.com> - Ported to f2fs-tools
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
diff --git a/fsck/quotaio_tree.c b/fsck/quotaio_tree.c
index c203400..40521c5 100644
--- a/fsck/quotaio_tree.c
+++ b/fsck/quotaio_tree.c
@@ -5,7 +5,6 @@
  * Hyojun Kim <hyojun@google.com> - Ported to f2fs-tools
  */
 
-#include "config.h"
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/fsck/quotaio_v2.c b/fsck/quotaio_v2.c
index 9353f85..e19f303 100644
--- a/fsck/quotaio_v2.c
+++ b/fsck/quotaio_v2.c
@@ -5,7 +5,6 @@
  * Hyojun Kim <hyojun@google.com> - Ported to f2fs-tools
  */
 
-#include "config.h"
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/nls_utf8.c b/lib/nls_utf8.c
index 9e7590d..e6f34ba 100644
--- a/lib/nls_utf8.c
+++ b/lib/nls_utf8.c
@@ -20,14 +20,13 @@
  * implementation.
  */
 
-#include "config.h"
 #include <stdint.h>
 #include <unistd.h>
 #include <string.h>
 #include <limits.h>
 #include <errno.h>
 
-#include "f2fs_fs.h"
+#include <f2fs_fs.h>
 
 /* Encoding a unicode version number as a single unsigned int. */
 #define UNICODE_MAJ_SHIFT		(16)
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 6da814d..8fb97af 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -10,8 +10,6 @@
 #define _LARGEFILE64_SOURCE
 #endif
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
index fc028a8..b8a0758 100644
--- a/mkfs/f2fs_format_main.c
+++ b/mkfs/f2fs_format_main.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 #include <getopt.h>
 
-#include "config.h"
+#include <f2fs_fs.h>
+
 #ifdef HAVE_LIBBLKID
 #include <blkid/blkid.h>
 #endif
@@ -32,7 +33,6 @@
 #include <uuid/uuid.h>
 #endif
 
-#include "f2fs_fs.h"
 #include "quota.h"
 #include "f2fs_format_utils.h"
 
diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
index 0edac6f..2f0fc7b 100644
--- a/tools/f2fs_io/f2fs_io.c
+++ b/tools/f2fs_io/f2fs_io.c
@@ -43,7 +43,7 @@
 #include <unistd.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <android_config.h>
 
diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c
index 1233f3a..8640ffa 100644
--- a/tools/f2fscrypt.c
+++ b/tools/f2fscrypt.c
@@ -20,7 +20,6 @@
 #define _GNU_SOURCE
 #endif
 
-#include "config.h"
 #include <f2fs_fs.h>
 
 #include <assert.h>
diff --git a/tools/sha512.c b/tools/sha512.c
index bf0d9a4..c6d35af 100644
--- a/tools/sha512.c
+++ b/tools/sha512.c
@@ -11,7 +11,6 @@
  */
 
 
-#include "config.h"
 #include <assert.h>
 #include <errno.h>
 #include <getopt.h>