diff --git a/fs/exfat/exfat_api.c b/fs/exfat/exfat_api.c
index 32b29f0dd..ce991c145 100644
--- a/fs/exfat/exfat_api.c
+++ b/fs/exfat/exfat_api.c
@@ -37,7 +37,6 @@
 #include <linux/init.h>
 
 #include "exfat_version.h"
-#include "exfat_config.h"
 #include "exfat_data.h"
 #include "exfat_oal.h"
 
diff --git a/fs/exfat/exfat_api.h b/fs/exfat/exfat_api.h
index 84bdf612a..ee6ab0f04 100644
--- a/fs/exfat/exfat_api.h
+++ b/fs/exfat/exfat_api.h
@@ -36,7 +36,6 @@
 #define _EXFAT_API_H
 
 #include <linux/fs.h>
-#include "exfat_config.h"
 
 /*----------------------------------------------------------------------*/
 /*  Constant & Macro Definitions                                        */
diff --git a/fs/exfat/exfat_bitmap.c b/fs/exfat/exfat_bitmap.c
index b0672dd07..00c834cdf 100644
--- a/fs/exfat/exfat_bitmap.c
+++ b/fs/exfat/exfat_bitmap.c
@@ -32,7 +32,6 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "exfat_config.h"
 #include "exfat_bitmap.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/fs/exfat/exfat_blkdev.c b/fs/exfat/exfat_blkdev.c
index eaccfd84e..8133331d8 100644
--- a/fs/exfat/exfat_blkdev.c
+++ b/fs/exfat/exfat_blkdev.c
@@ -34,7 +34,6 @@
 
 #include <linux/blkdev.h>
 #include <linux/log2.h>
-#include "exfat_config.h"
 #include "exfat_blkdev.h"
 #include "exfat_data.h"
 #include "exfat_api.h"
diff --git a/fs/exfat/exfat_blkdev.h b/fs/exfat/exfat_blkdev.h
index 3363b591c..df40ad59d 100644
--- a/fs/exfat/exfat_blkdev.h
+++ b/fs/exfat/exfat_blkdev.h
@@ -36,7 +36,6 @@
 #define _EXFAT_BLKDEV_H
 
 #include <linux/fs.h>
-#include "exfat_config.h"
 
 /*----------------------------------------------------------------------*/
 /*  Constant & Macro Definitions (Non-Configurable)                     */
diff --git a/fs/exfat/exfat_cache.c b/fs/exfat/exfat_cache.c
index 4130102e3..4aa6cdf2e 100644
--- a/fs/exfat/exfat_cache.c
+++ b/fs/exfat/exfat_cache.c
@@ -33,7 +33,6 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "exfat_config.h"
 #include "exfat_data.h"
 
 #include "exfat_cache.h"
diff --git a/fs/exfat/exfat_cache.h b/fs/exfat/exfat_cache.h
index 540e31681..fd2b68937 100644
--- a/fs/exfat/exfat_cache.h
+++ b/fs/exfat/exfat_cache.h
@@ -38,7 +38,6 @@
 
 #include <linux/fs.h>
 #include <linux/types.h>
-#include "exfat_config.h"
 
 /*----------------------------------------------------------------------*/
 /*  Constant & Macro Definitions                                        */
diff --git a/fs/exfat/exfat_config.h b/fs/exfat/exfat_config.h
deleted file mode 100644
index 33c6525e4..000000000
--- a/fs/exfat/exfat_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-/************************************************************************/
-/*                                                                      */
-/*  PROJECT : exFAT & FAT12/16/32 File System                           */
-/*  FILE    : exfat_config.h                                            */
-/*  PURPOSE : Header File for exFAT Configuable Policies                */
-/*                                                                      */
-/*----------------------------------------------------------------------*/
-/*  NOTES                                                               */
-/*                                                                      */
-/*----------------------------------------------------------------------*/
-/*  REVISION HISTORY (Ver 0.9)                                          */
-/*                                                                      */
-/*  - 2010.11.15 [Joosun Hahn] : first writing                          */
-/*                                                                      */
-/************************************************************************/
-
-#ifndef _EXFAT_CONFIG_H
-#define _EXFAT_CONFIG_H
-
-/*======================================================================*/
-/*                                                                      */
-/*                        FFS CONFIGURATIONS                            */
-/*                  (CHANGE THIS PART IF REQUIRED)                      */
-/*                                                                      */
-/*======================================================================*/
-
-/*----------------------------------------------------------------------*/
-/* Feature Config                                                       */
-/*----------------------------------------------------------------------*/
-#ifndef CONFIG_EXFAT_DISCARD
-#define CONFIG_EXFAT_DISCARD		1	/* mount option -o discard support */
-#endif
-
-#ifndef CONFIG_EXFAT_DELAYED_SYNC
-#define CONFIG_EXFAT_DELAYED_SYNC 0
-#endif
-
-#ifndef CONFIG_EXFAT_KERNEL_DEBUG
-#define CONFIG_EXFAT_KERNEL_DEBUG	1	/* kernel debug features via ioctl */
-#endif
-
-#ifndef CONFIG_EXFAT_DEBUG_MSG
-#define CONFIG_EXFAT_DEBUG_MSG		0	/* debugging message on/off */
-#endif
-
-#ifndef CONFIG_EXFAT_DEFAULT_CODEPAGE
-#define CONFIG_EXFAT_DEFAULT_CODEPAGE	437
-#define CONFIG_EXFAT_DEFAULT_IOCHARSET	"utf8"
-#endif
-
-#endif /* _EXFAT_CONFIG_H */
diff --git a/fs/exfat/exfat_core.c b/fs/exfat/exfat_core.c
index ad3fc93a5..2736ae461 100644
--- a/fs/exfat/exfat_core.c
+++ b/fs/exfat/exfat_core.c
@@ -46,7 +46,6 @@
 #include <linux/log2.h>
 
 #include "exfat_bitmap.h"
-#include "exfat_config.h"
 #include "exfat_data.h"
 #include "exfat_oal.h"
 #include "exfat_blkdev.h"
diff --git a/fs/exfat/exfat_core.h b/fs/exfat/exfat_core.h
index d4bfc7146..b883f7c8a 100644
--- a/fs/exfat/exfat_core.h
+++ b/fs/exfat/exfat_core.h
@@ -35,7 +35,6 @@
 #ifndef _EXFAT_H
 #define _EXFAT_H
 
-#include "exfat_config.h"
 #include "exfat_data.h"
 #include "exfat_oal.h"
 
@@ -196,7 +195,7 @@
 #define UTBL_ROW_COUNT (1<<LOW_INDEX_BIT)
 #define UTBL_COL_COUNT (1<<HIGH_INDEX_BIT)
 
-#if CONFIG_EXFAT_DEBUG_MSG
+#ifdef CONFIG_EXFAT_DEBUG_MSG
 #define DPRINTK(...)			\
 	do {								\
 		printk("[EXFAT] " __VA_ARGS__);	\
diff --git a/fs/exfat/exfat_data.c b/fs/exfat/exfat_data.c
index 01f054411..b63c2ce85 100644
--- a/fs/exfat/exfat_data.c
+++ b/fs/exfat/exfat_data.c
@@ -32,7 +32,6 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "exfat_config.h"
 #include "exfat_data.h"
 #include "exfat_oal.h"
 
diff --git a/fs/exfat/exfat_data.h b/fs/exfat/exfat_data.h
index 53b0e3939..d3595e74b 100644
--- a/fs/exfat/exfat_data.h
+++ b/fs/exfat/exfat_data.h
@@ -35,8 +35,6 @@
 #ifndef _EXFAT_DATA_H
 #define _EXFAT_DATA_H
 
-#include "exfat_config.h"
-
 /*======================================================================*/
 /*                                                                      */
 /*                        FFS CONFIGURATIONS                            */
diff --git a/fs/exfat/exfat_nls.c b/fs/exfat/exfat_nls.c
index aba603b13..b883cbe7f 100644
--- a/fs/exfat/exfat_nls.c
+++ b/fs/exfat/exfat_nls.c
@@ -32,7 +32,6 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "exfat_config.h"
 #include "exfat_data.h"
 
 #include "exfat_nls.h"
diff --git a/fs/exfat/exfat_nls.h b/fs/exfat/exfat_nls.h
index bc516d762..8f4201d03 100644
--- a/fs/exfat/exfat_nls.h
+++ b/fs/exfat/exfat_nls.h
@@ -38,7 +38,6 @@
 #include <linux/types.h>
 #include <linux/nls.h>
 
-#include "exfat_config.h"
 #include "exfat_api.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/fs/exfat/exfat_oal.c b/fs/exfat/exfat_oal.c
index 1dad0f95d..f3c5fc3c8 100644
--- a/fs/exfat/exfat_oal.c
+++ b/fs/exfat/exfat_oal.c
@@ -48,7 +48,6 @@
 typedef time64_t    time_t;
 #endif
 
-#include "exfat_config.h"
 #include "exfat_api.h"
 #include "exfat_oal.h"
 
diff --git a/fs/exfat/exfat_oal.h b/fs/exfat/exfat_oal.h
index b6dd7897a..476b4b95a 100644
--- a/fs/exfat/exfat_oal.h
+++ b/fs/exfat/exfat_oal.h
@@ -37,7 +37,6 @@
 #define _EXFAT_OAL_H
 
 #include <linux/semaphore.h>
-#include "exfat_config.h"
 #include <linux/version.h>
 
 /*----------------------------------------------------------------------*/
diff --git a/fs/exfat/exfat_super.c b/fs/exfat/exfat_super.c
index 47d43cf32..99d793f65 100644
--- a/fs/exfat/exfat_super.c
+++ b/fs/exfat/exfat_super.c
@@ -75,7 +75,6 @@ typedef time64_t    time_t;
 #include <asm/unaligned.h>
 
 #include "exfat_version.h"
-#include "exfat_config.h"
 #include "exfat_data.h"
 #include "exfat_oal.h"
 
diff --git a/fs/exfat/exfat_super.h b/fs/exfat/exfat_super.h
index 343c1e64f..c7780e1d3 100644
--- a/fs/exfat/exfat_super.h
+++ b/fs/exfat/exfat_super.h
@@ -28,7 +28,6 @@
 #include <linux/mutex.h>
 #include <linux/swap.h>
 
-#include "exfat_config.h"
 #include "exfat_data.h"
 #include "exfat_oal.h"
 
diff --git a/fs/exfat/exfat_upcase.c b/fs/exfat/exfat_upcase.c
index 3807f37ca..7bd2b513a 100644
--- a/fs/exfat/exfat_upcase.c
+++ b/fs/exfat/exfat_upcase.c
@@ -32,8 +32,6 @@
 /*                                                                      */
 /************************************************************************/
 
-#include "exfat_config.h"
-
 #include "exfat_nls.h"
 
 const u8 uni_upcase[NUM_UPCASE<<1] = {