diff --git a/loader/Makefile b/loader/Makefile
index d772e42..e06005b 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -32,7 +32,7 @@ INCLUDES	:=	include source/fatfs  source/fatfs/sdmmc
 ARCH	:=	-mthumb -mthumb-interwork
 
 CFLAGS	:=	-g -Wall -O2\
-			-march=armv5te -mtune=arm946e-s -fomit-frame-pointer\
+			-march=armv5te -mtune=arm946e-s\
 			-ffast-math -Wno-main -std=c99\
 			$(ARCH)
 
diff --git a/loader/source/fatfs/diskio.c b/loader/source/fatfs/diskio.c
index 9e379e4..a2428e7 100644
--- a/loader/source/fatfs/diskio.c
+++ b/loader/source/fatfs/diskio.c
@@ -69,7 +69,7 @@ DRESULT disk_read (
 DRESULT disk_write (
 	__attribute__((unused))
 	BYTE pdrv,			/* Physical drive nmuber to identify the drive */
-	const BYTE *buff,	/* Data to be written */
+	const BYTE *buff,       	/* Data to be written */
 	DWORD sector,		/* Sector address in LBA */
 	UINT count			/* Number of sectors to write */
 )
diff --git a/loader/source/fatfs/ff.c b/loader/source/fatfs/ff.c
index 396df7c..3a7953e 100644
--- a/loader/source/fatfs/ff.c
+++ b/loader/source/fatfs/ff.c
@@ -811,7 +811,7 @@ FRESULT sync_fs (	/* FR_OK: successful, FR_DISK_ERR: failed */
 /*-----------------------------------------------------------------------*/
 /* Hidden API for hacks and disk tools */
 
-DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
+static DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
 	FATFS* fs,		/* File system object */
 	DWORD clst		/* Cluster# to be converted */
 )
@@ -829,7 +829,7 @@ DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
 /*-----------------------------------------------------------------------*/
 /* Hidden API for hacks and disk tools */
 
-DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluster status */
+static DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluster status */
 	FATFS* fs,	/* File system object */
 	DWORD clst	/* FAT index number (cluster number) to get the value */
 )
@@ -884,7 +884,7 @@ DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluste
 /* Hidden API for hacks and disk tools */
 
 #if !_FS_READONLY
-FRESULT put_fat (
+static FRESULT put_fat (
 	FATFS* fs,	/* File system object */
 	DWORD clst,	/* FAT index number (cluster number) to be changed */
 	DWORD val	/* New value to be set to the entry */
diff --git a/loader/source/fatfs/sdmmc/common.h b/loader/source/fatfs/sdmmc/common.h
index 90a327e..3b77ae6 100644
--- a/loader/source/fatfs/sdmmc/common.h
+++ b/loader/source/fatfs/sdmmc/common.h
@@ -1,4 +1,3 @@
 #pragma once
 
-#include <stdbool.h>
 #include "../../types.h"
\ No newline at end of file
diff --git a/loader/source/fatfs/sdmmc/sdmmc.c b/loader/source/fatfs/sdmmc/sdmmc.c
index 34b8c6d..5a3bf91 100644
--- a/loader/source/fatfs/sdmmc/sdmmc.c
+++ b/loader/source/fatfs/sdmmc/sdmmc.c
@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common.h"
-
 #include "sdmmc.h"
 #include "delay.h"
 
diff --git a/loader/source/i2c.h b/loader/source/i2c.h
index f047c17..7377c28 100644
--- a/loader/source/i2c.h
+++ b/loader/source/i2c.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "types.h"
 
 #define I2C1_REG_OFF 0x10161000
 #define I2C2_REG_OFF 0x10144000
diff --git a/loader/source/main.c b/loader/source/main.c
index 42df9ee..7cc0d43 100644
--- a/loader/source/main.c
+++ b/loader/source/main.c
@@ -5,7 +5,7 @@
 
 #define PAYLOAD_ADDRESS	0x23F00000
 
-u32 loadPayload(const char *path){
+static u32 loadPayload(const char *path){
     FIL payload;
     unsigned int br;
     if(f_open(&payload, path, FA_READ) == FR_OK)
@@ -19,7 +19,7 @@ u32 loadPayload(const char *path){
     return 0;
 }
 
-void main(){
+void main(void){
     FATFS fs;
     f_mount(&fs, "0:", 1);
 
diff --git a/loader/source/screeninit.c b/loader/source/screeninit.c
index 38640aa..0bb02c8 100644
--- a/loader/source/screeninit.c
+++ b/loader/source/screeninit.c
@@ -1,12 +1,10 @@
 #include "screeninit.h"
 #include "i2c.h"
 
-void initLCD()
-{
+void initLCD(void){
     vu32 *const arm11 = (u32 *)0x1FFFFFF8;
 
-    void __attribute__((naked)) ARM11()
-    {
+    void __attribute__((naked)) ARM11(void){
         *(vu32 *)0x10141200 = 0x1007F;
         *(vu32 *)0x10202014 = 0x00000001;
         *(vu32 *)0x1020200C &= 0xFFFEFFFE;
diff --git a/loader/source/screeninit.h b/loader/source/screeninit.h
index 95311a3..15f9cec 100644
--- a/loader/source/screeninit.h
+++ b/loader/source/screeninit.h
@@ -2,4 +2,4 @@
 
 #include "types.h"
 
-void initLCD();
\ No newline at end of file
+void initLCD(void);
\ No newline at end of file
diff --git a/loader/source/types.h b/loader/source/types.h
index 56d82bb..be2a914 100644
--- a/loader/source/types.h
+++ b/loader/source/types.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/source/fatfs/diskio.c b/source/fatfs/diskio.c
index 9e379e4..a2428e7 100644
--- a/source/fatfs/diskio.c
+++ b/source/fatfs/diskio.c
@@ -69,7 +69,7 @@ DRESULT disk_read (
 DRESULT disk_write (
 	__attribute__((unused))
 	BYTE pdrv,			/* Physical drive nmuber to identify the drive */
-	const BYTE *buff,	/* Data to be written */
+	const BYTE *buff,       	/* Data to be written */
 	DWORD sector,		/* Sector address in LBA */
 	UINT count			/* Number of sectors to write */
 )
diff --git a/source/fatfs/ff.c b/source/fatfs/ff.c
index 396df7c..3a7953e 100644
--- a/source/fatfs/ff.c
+++ b/source/fatfs/ff.c
@@ -811,7 +811,7 @@ FRESULT sync_fs (	/* FR_OK: successful, FR_DISK_ERR: failed */
 /*-----------------------------------------------------------------------*/
 /* Hidden API for hacks and disk tools */
 
-DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
+static DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
 	FATFS* fs,		/* File system object */
 	DWORD clst		/* Cluster# to be converted */
 )
@@ -829,7 +829,7 @@ DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
 /*-----------------------------------------------------------------------*/
 /* Hidden API for hacks and disk tools */
 
-DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluster status */
+static DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluster status */
 	FATFS* fs,	/* File system object */
 	DWORD clst	/* FAT index number (cluster number) to get the value */
 )
@@ -884,7 +884,7 @@ DWORD get_fat (	/* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x0FFFFFFF:Cluste
 /* Hidden API for hacks and disk tools */
 
 #if !_FS_READONLY
-FRESULT put_fat (
+static FRESULT put_fat (
 	FATFS* fs,	/* File system object */
 	DWORD clst,	/* FAT index number (cluster number) to be changed */
 	DWORD val	/* New value to be set to the entry */
diff --git a/source/fatfs/sdmmc/sdmmc.c b/source/fatfs/sdmmc/sdmmc.c
index 34b8c6d..5a3bf91 100644
--- a/source/fatfs/sdmmc/sdmmc.c
+++ b/source/fatfs/sdmmc/sdmmc.c
@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common.h"
-
 #include "sdmmc.h"
 #include "delay.h"
 
diff --git a/source/main.c b/source/main.c
index 336659d..c826738 100644
--- a/source/main.c
+++ b/source/main.c
@@ -9,12 +9,12 @@
 #include "fs.h"
 #include "firm.h"
 
-void main(){
+void main(void){
     mountSD();
     setupCFW();
 }
 
-void startCFW(){
+void startCFW(void){
     if(!loadFirm()) return;
     if(!patchFirm()) return;
     launchFirm();