diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index eadbc86333f6f0714e0558874a5c2f31e3d06ea5..9515ed0163b71f8e4998cb732a799f7939910e4c 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -5,7 +5,7 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_USB_GADGET)	+= udc-core.o
 obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o
-libcomposite-y			:= usbstring.o
+libcomposite-y			:= usbstring.o config.o
 obj-$(CONFIG_USB_DUMMY_HCD)	+= dummy_hcd.o
 obj-$(CONFIG_USB_NET2272)	+= net2272.o
 obj-$(CONFIG_USB_NET2280)	+= net2280.o
diff --git a/drivers/usb/gadget/acm_ms.c b/drivers/usb/gadget/acm_ms.c
index 9820960dfc5c21dfb46c23d8f64395e482389555..3078d797f634f72b26dabe5d3ee5b09c005913fb 100644
--- a/drivers/usb/gadget/acm_ms.c
+++ b/drivers/usb/gadget/acm_ms.c
@@ -42,7 +42,6 @@
  */
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 #include "u_serial.c"
 #include "f_acm.c"
diff --git a/drivers/usb/gadget/audio.c b/drivers/usb/gadget/audio.c
index 76e54b44c27ae961d2853b3b9bbbe11296a2fd91..9e85df22e796f0a550b2019889df95badd7ce1bc 100644
--- a/drivers/usb/gadget/audio.c
+++ b/drivers/usb/gadget/audio.c
@@ -27,7 +27,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 /* string IDs are assigned dynamically */
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 74a9c7f65ec8265d2ee37ef469ad2ed87536b248..d06d0791c70ecf82614935647fc2ee9e38bf60cb 100644
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -44,7 +44,6 @@
  */
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 #include "u_serial.c"
 #include "f_acm.c"
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index 7542a72ce51ae51a0cbf801650ea22a2f2cdd56b..e3a98929d3463d50ad395be7bf7fe08c92dfc983 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/list.h>
 #include <linux/string.h>
 #include <linux/device.h>
@@ -53,7 +54,7 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen,
 	}
 	return dest - (u8 *)buf;
 }
-
+EXPORT_SYMBOL_GPL(usb_descriptor_fillbuf);
 
 /**
  * usb_gadget_config_buf - builts a complete configuration descriptor
@@ -106,6 +107,7 @@ int usb_gadget_config_buf(
 	cp->bmAttributes |= USB_CONFIG_ATT_ONE;
 	return len;
 }
+EXPORT_SYMBOL_GPL(usb_gadget_config_buf);
 
 /**
  * usb_copy_descriptors - copy a vector of USB descriptors
@@ -155,4 +157,4 @@ usb_copy_descriptors(struct usb_descriptor_header **src)
 
 	return ret;
 }
-
+EXPORT_SYMBOL_GPL(usb_copy_descriptors);
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index e16094e5d1d2b8c70175c0bcb2281d7acf119dcf..557021e267eee74f24060c5761b4c2a570401321 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -103,7 +103,6 @@ static inline bool has_rndis(void)
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "f_ecm.c"
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 8d0166b76d40e8dd154b185edb037323306f1a83..77cf1083099f94ed30d338f3957b9ec5dad3393c 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -265,7 +265,6 @@
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
-#include "config.c"
 #include "epautoconf.c"
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index 407b5ccc64a418eec9330be2ca226fe68b48fb96..240957048d3fa2c93de7876a693af1f977048986 100644
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -24,7 +24,6 @@
  */
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #if defined CONFIG_USB_FUNCTIONFS_ETH || defined CONFIG_USB_FUNCTIONFS_RNDIS
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 135b3900eaa379c0bca3ac8d8023a55da97d72df..68a79b42c5a8a4df6ab95ec1cb0347dea0c3cfec 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -38,7 +38,6 @@
 #include "gadget_chips.h"
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 #include "f_midi.c"
 
diff --git a/drivers/usb/gadget/hid.c b/drivers/usb/gadget/hid.c
index effda2e0742b0a3fadedf095ef2565c654333c3a..917c6eda916ac6c775ae52117b202b52696819ec 100644
--- a/drivers/usb/gadget/hid.c
+++ b/drivers/usb/gadget/hid.c
@@ -35,7 +35,6 @@
  */
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "f_hid.c"
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index a7f32c312a6bd809f8b249422f61bd92f18b6cfc..9675e61c9a8da70e9bc810d59da72a370f0d2453 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -49,7 +49,6 @@
  */
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 #include "f_mass_storage.c"
 
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 71c1fabdbb78d8991c00dfacccd8b9b07d0012d9..6b6c12802afcf9a37397a804da57bebafc44d805 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -44,7 +44,6 @@ MODULE_LICENSE("GPL");
  */
 
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "f_mass_storage.c"
diff --git a/drivers/usb/gadget/ncm.c b/drivers/usb/gadget/ncm.c
index d7e6b1ee866463f586e6b042c0566705eff3a9ff..ce8d08e44602e7ab4e215bdd43cf4d5ea0be91ca 100644
--- a/drivers/usb/gadget/ncm.c
+++ b/drivers/usb/gadget/ncm.c
@@ -37,7 +37,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "f_ncm.c"
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index 474c77ca58c02a236bee1cf7ff6c982d948cb439..e2f4b9bdebc37876b064a17c87fc0ae88fdb1fac 100644
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -39,7 +39,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "u_serial.c"
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index c55e7d99b810f7d99592e29b008e643be00ad05a..310b22d423a77bdf3c90d6800e6e2d0f4290b13e 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -52,7 +52,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 88baa9e3f8279c57cf55d2059b6de3c413321605..39990bed0905c45e1f4533095966850c0202811f 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -38,7 +38,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "f_acm.c"
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 327af68837151cd7556b31db9206a34e7456d38e..926e0facfba5fdd380d631f8e42d69792b67f56a 100644
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -26,7 +26,6 @@
 #include <asm/unaligned.h>
 
 #include "epautoconf.c"
-#include "config.c"
 #include "composite.c"
 
 #include "tcm_usb_gadget.h"
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c
index dc8fd5cc4f92ed4a99046adfd80b011bff1af870..5e500e8403fd475bfc5b1adb390af77ec414c289 100644
--- a/drivers/usb/gadget/webcam.c
+++ b/drivers/usb/gadget/webcam.c
@@ -24,7 +24,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "uvc_queue.c"
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 4469be8fcee378915c0e86dc22f5ea95a004693e..e39a3b5da101617afd8fe8bdaa870249e09cab4b 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -59,7 +59,6 @@
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
 #include "composite.c"
-#include "config.c"
 #include "epautoconf.c"
 
 #include "f_sourcesink.c"