diff --git a/audio/playtone/Makefile b/audio/playtone/Makefile
index 67a9c37..8ab34cd 100644
--- a/audio/playtone/Makefile
+++ b/audio/playtone/Makefile
@@ -41,7 +41,7 @@ EXEFS_SRC	:=	exefs_src
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 \
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -DSWITCH
diff --git a/graphics/printing/hello-world/Makefile b/graphics/printing/hello-world/Makefile
index ecaa1ae..81584e9 100644
--- a/graphics/printing/hello-world/Makefile
+++ b/graphics/printing/hello-world/Makefile
@@ -41,7 +41,7 @@ EXEFS_SRC	:=	exefs_src
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 \
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -DSWITCH
diff --git a/graphics/simplegfx/Makefile b/graphics/simplegfx/Makefile
index ecaa1ae..81584e9 100644
--- a/graphics/simplegfx/Makefile
+++ b/graphics/simplegfx/Makefile
@@ -41,7 +41,7 @@ EXEFS_SRC	:=	exefs_src
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 \
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -DSWITCH
diff --git a/hid/irsensor/Makefile b/hid/irsensor/Makefile
index ecaa1ae..81584e9 100644
--- a/hid/irsensor/Makefile
+++ b/hid/irsensor/Makefile
@@ -41,7 +41,7 @@ EXEFS_SRC	:=	exefs_src
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 \
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -DSWITCH
diff --git a/templates/application/Makefile b/templates/application/Makefile
index ecaa1ae..81584e9 100644
--- a/templates/application/Makefile
+++ b/templates/application/Makefile
@@ -41,7 +41,7 @@ EXEFS_SRC	:=	exefs_src
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 \
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -DSWITCH
diff --git a/usb/usbds/Makefile b/usb/usbds/Makefile
index ecaa1ae..81584e9 100644
--- a/usb/usbds/Makefile
+++ b/usb/usbds/Makefile
@@ -41,7 +41,7 @@ EXEFS_SRC	:=	exefs_src
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 \
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -DSWITCH
diff --git a/usb/usbds/source/main.c b/usb/usbds/source/main.c
index 0565f2a..8773728 100644
--- a/usb/usbds/source/main.c
+++ b/usb/usbds/source/main.c
@@ -6,8 +6,7 @@
 
 //Example for usbds, see libnx usb.h. Switch-as-device<>host USB comms.
 //Linux detects this as a serial device.
-//For using serial via usbds in general, see the usbdev example.
-//See libnx usbdev.c/usb.h for getting actual-transfer-size after using usbDsEndpoint_PostBufferAsync.
+//See libnx usb_comms.c/usb.h for getting actual-transfer-size after using usbDsEndpoint_PostBufferAsync.
 
 Result usbds_test(u8 *tmpbuf)
 {