diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
index d5761e25..4d9f7bbe 100644
--- a/.github/workflows/compilation.yml
+++ b/.github/workflows/compilation.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ps2dev/ps2dev:v1.0
+    container: ps2dev/ps2dev:v1.1
     # instead of "ps2dev/ps2dev:latest" you can use different tags, for example for old projects you can use "ps2dev/ps2dev:v1.0"
     steps:
     - name: Install dependencies
diff --git a/Makefile b/Makefile
index 9a789ae6..88b8996f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ EE_BIN = $(EE_BIN_DIR)SMS.elf
 
 EE_INCS    = -I$(EE_INC_DIR) -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I$(PS2SDK)/ports/include -I$(PS2SDK)/sbv/include
 EE_LDFLAGS = -L$(PS2SDK)/sbv/lib -L$(PS2SDK)/ee/lib -L$(PS2SDK)/ports/lib -L$(EE_SRC_DIR)/lzma2
-EE_LIBS    = -lpatches -lc -lkernel -lmf
+EE_LIBS    = -lpatches -lc -lkernel-nopatch -lm
 
 EE_OBJS  = main.o SMS_OS.o SMS_GS_0.o SMS_GS_1.o SMS_GS_2.o SMS_Timer.o           \
            SMS_MP123Core.o SMS_FileContext.o  SMS_H263.o                          \
@@ -74,9 +74,9 @@ $(EE_OBJ_DIR)%.o : $(EE_SRC_DIR)%.s
 $(EE_OBJ_DIR)%.o : $(EE_SRC_DIR)%.S
 	$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
 
-$(EE_BIN) : $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o
-	$(EE_CC) -mno-crt0 -T$(PS2SDK)/ee/startup/linkfile $(EE_LDFLAGS) \
-		     -o $(EE_BIN) $(PS2SDK)/ee/startup/crt0.o $(EE_OBJS) $(EE_LIBS) -Xlinker -Map -Xlinker ./obj/SMS.map
+$(EE_BIN) : $(EE_OBJS)
+	$(EE_CC) $(EE_LDFLAGS) \
+		     -o $(EE_BIN) $(EE_OBJS) $(EE_LIBS) -Xlinker -Map -Xlinker ./obj/SMS.map
 
 rebuild: clean all
 
diff --git a/iop/SMSCDVD/SMSCDVD.c b/iop/SMSCDVD/SMSCDVD.c
index 85db95e0..f8ef36ce 100644
--- a/iop/SMSCDVD/SMSCDVD.c
+++ b/iop/SMSCDVD/SMSCDVD.c
@@ -894,7 +894,7 @@ static int CDVD_dopen ( iop_io_file_t* apFile, const char* apName ) {
 
 static int ISO_DRead ( iop_io_file_t* apFile, void* apRetVal ) {
 
- fio_dirent_t* lpBuf = ( fio_dirent_t* )apRetVal;
+ io_dirent_t* lpBuf = ( io_dirent_t* )apRetVal;
 
  if ( !s_tocEntryPointer ) return -EPROTO;
 
diff --git a/iop/SMSCDVD/SMSCDVD_UDFS.c b/iop/SMSCDVD/SMSCDVD_UDFS.c
index 9a7e0d1f..2e5e5dcb 100644
--- a/iop/SMSCDVD/SMSCDVD_UDFS.c
+++ b/iop/SMSCDVD/SMSCDVD_UDFS.c
@@ -555,7 +555,7 @@ static int UDF_DOpen ( iop_io_file_t* apFile, const char* apPath ) {
 
 static int UDF_DRead ( iop_io_file_t* apFile, void* apRetVal ) {
 
- fio_dirent_t* lpBuf = ( fio_dirent_t* )apRetVal;
+ io_dirent_t* lpBuf = ( io_dirent_t* )apRetVal;
  UDFAddress    lFileICB;
 
  if ( s_ScanPos == 0xFFFFFFFF ) return -EPROTO;
diff --git a/iop/SMSUMS/src/ums.c b/iop/SMSUMS/src/ums.c
index 58b827fe..a7ed3d6d 100644
--- a/iop/SMSUMS/src/ums.c
+++ b/iop/SMSUMS/src/ums.c
@@ -441,9 +441,9 @@ static int _ums_dread ( iop_file_t* apFile, void* apData ) {
 
    else {
 
-    fio_dirent_t* lpEntry = ( fio_dirent_t* )apData;
+    io_dirent_t* lpEntry = ( io_dirent_t* )apData;
 
-    mips_memset (  apData, 0, sizeof ( fio_dirent_t )  );
+    mips_memset (  apData, 0, sizeof ( io_dirent_t )  );
     strcpy ( lpEntry -> name, lpDev -> m_LUName[ lIdx ] );
     lIdx                += 1;
     lpEntry -> stat.mode = FIO_SO_IFDIR;
diff --git a/iop/SMSUMS/src/ums_fat.c b/iop/SMSUMS/src/ums_fat.c
index 4ee47ff5..a98b9a23 100644
--- a/iop/SMSUMS/src/ums_fat.c
+++ b/iop/SMSUMS/src/ums_fat.c
@@ -912,7 +912,7 @@ static int _fat_dclose ( iop_file_t* apFile ) {
 
 static int _fat_dread ( iop_file_t* apFile, void* apBuf ) {
 
- fio_dirent_t*   lpEntry  = ( fio_dirent_t*   )apBuf;
+ io_dirent_t*   lpEntry  = ( io_dirent_t*   )apBuf;
  find_file_info* lpFFInfo = ( find_file_info* )apFile -> privdata;
  USBMDevice*     lpDev;
  int             lfCont;
diff --git a/src/SMS_AAC.c b/src/SMS_AAC.c
index 38da924e..9943e66d 100644
--- a/src/SMS_AAC.c
+++ b/src/SMS_AAC.c
@@ -32,7 +32,7 @@
 #include "SMS_Locale.h"
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/src/SMS_Codec.c b/src/SMS_Codec.c
index be17ccac..0846793e 100644
--- a/src/SMS_Codec.c
+++ b/src/SMS_Codec.c
@@ -26,7 +26,8 @@
 #include "SMS_FLAC.h"
 #include "SMS_VideoBuffer.h"
 
-#include <malloc.h>
+#include <stdlib.h>
+#include <ctype.h>
 #include <string.h>
 
 static SMS_CodecTag s_CodecVideoTags[] = {
diff --git a/src/SMS_Config.c b/src/SMS_Config.c
index 01f465ba..04032b30 100644
--- a/src/SMS_Config.c
+++ b/src/SMS_Config.c
@@ -18,8 +18,12 @@
 #include "SMS_IOP.h"
 
 #include <malloc.h>
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
+#include <sjis.h>
 
 extern void _check_dc_offset ( void );
 extern unsigned char g_IconSMS[ 2020 ] __attribute__(   (  section( ".data" )  )   );
diff --git a/src/SMS_ContainerMOV.c b/src/SMS_ContainerMOV.c
index a536b7f8..2e4fad4f 100644
--- a/src/SMS_ContainerMOV.c
+++ b/src/SMS_ContainerMOV.c
@@ -18,6 +18,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 typedef struct MOVIndex {
  uint32_t m_Flags;
diff --git a/src/SMS_CopyTree.c b/src/SMS_CopyTree.c
index 52b6e933..cda1406c 100644
--- a/src/SMS_CopyTree.c
+++ b/src/SMS_CopyTree.c
@@ -27,6 +27,9 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+#define NEWLIB_PORT_AWARE
+#include <fileio.h>
 
 #define BUF_SIZE ( 4096 * 96 )
 
diff --git a/src/SMS_DirTree.c b/src/SMS_DirTree.c
index 81b1fd53..e9813bfa 100644
--- a/src/SMS_DirTree.c
+++ b/src/SMS_DirTree.c
@@ -16,7 +16,9 @@
 #include <malloc.h>
 #include <string.h>
 #include <sys/stat.h>
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
+#include <iox_stat.h>
 
 #define STRING( n ) (   (  ( char* )( n )  ) + sizeof ( SMS_DirNode )   )
 
@@ -94,7 +96,7 @@ void SMS_DirTreeScan ( SMS_DirTree* apTree, SMS_Dir* apRoot, const char* apPath
  if ( lDD >= 0 ) {
 
   SMS_DirNode* lpNode;
-  fio_dirent_t lEntry;
+  io_dirent_t lEntry;
 
   if ( apTree -> DirCB ) {
    apTree -> m_Error = apTree -> DirCB ( lpPath );
diff --git a/src/SMS_EE.c b/src/SMS_EE.c
index 865d50ac..36a06791 100644
--- a/src/SMS_EE.c
+++ b/src/SMS_EE.c
@@ -31,8 +31,12 @@
 
 #include <kernel.h>
 #include <malloc.h>
+#include <ctype.h>
 #include <limits.h>
 #include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
 
 unsigned char* g_pSPRTop;
@@ -751,7 +755,7 @@ __asm__(
 
 void SMS_EEScanDir ( const char* apPath, const char* apExt, SMS_List* apList ) {
 
- fio_dirent_t lEntry;
+ io_dirent_t lEntry;
  int          lDD;
 
  lDD = fioDopen ( apPath );
diff --git a/src/SMS_FileContext.c b/src/SMS_FileContext.c
index 4cf4b654..8bb289ee 100644
--- a/src/SMS_FileContext.c
+++ b/src/SMS_FileContext.c
@@ -225,7 +225,9 @@ BOOL _find_signature ( CDDAContext* apCtx ) {
 }  /* end _find_signature */
 #else  /* PS2 */
 # include <kernel.h>
+# define NEWLIB_PORT_AWARE
 # include <fileio.h>
+# include <stdio.h>
 # include <fcntl.h>
 # include "SMS_CDDA.h"
 
diff --git a/src/SMS_FileDir.c b/src/SMS_FileDir.c
index 4f88c3d3..a3244a93 100644
--- a/src/SMS_FileDir.c
+++ b/src/SMS_FileDir.c
@@ -26,7 +26,10 @@
 
 #include <kernel.h>
 #include <string.h>
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
+#include <iox_stat.h>
+#include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <malloc.h>
@@ -84,25 +87,25 @@ int SMS_SubContID ( const char* apName ) {
 
   const char* lpExt = apName + lLen - 4;
 
-  if (  !stricmp ( lpExt, s_pMP3 ) ||
-        !stricmp ( lpExt, s_pMPA ) ||
-        !stricmp ( lpExt, s_pMP2 )
+  if (  !strcasecmp ( lpExt, s_pMP3 ) ||
+        !strcasecmp ( lpExt, s_pMPA ) ||
+        !strcasecmp ( lpExt, s_pMP2 )
   ) retVal = SMS_SUBCONTAINER_MP3;
-  else if (  !stricmp ( lpExt, s_pOGG )  )
+  else if (  !strcasecmp ( lpExt, s_pOGG )  )
    retVal = SMS_SUBCONTAINER_OGG;
-  else if (  !stricmp ( lpExt, s_pWMA )  )
+  else if (  !strcasecmp ( lpExt, s_pWMA )  )
    retVal = SMS_SUBCONTAINER_ASF;
-  else if (  !stricmp ( lpExt, s_pM4A ) ||
-             !stricmp ( lpExt, s_pMP4 )
+  else if (  !strcasecmp ( lpExt, s_pM4A ) ||
+             !strcasecmp ( lpExt, s_pMP4 )
        ) retVal = SMS_SUBCONTAINER_M4A;
-  else if (  !stricmp ( lpExt, s_pAAC )  )
+  else if (  !strcasecmp ( lpExt, s_pAAC )  )
    retVal = SMS_SUBCONTAINER_AAC;
-  else if (  !stricmp ( lpExt, s_pAC3 )  )
+  else if (  !strcasecmp ( lpExt, s_pAC3 )  )
    retVal = SMS_SUBCONTAINER_AC3;
 
   if ( retVal == -1 && lLen > 5 ) {
 
-   if (  !stricmp ( lpExt, s_pFLAC )  ) retVal = SMS_SUBCONTAINER_FLAC;
+   if (  !strcasecmp ( lpExt, s_pFLAC )  ) retVal = SMS_SUBCONTAINER_FLAC;
 
   }  /* end if */
 
@@ -121,41 +124,41 @@ int SMS_ContID ( const char* apName ) {
 
   const char* lpExt = apName + lLen - 4;
 
-  if (  !stricmp ( lpExt, s_pAVI )  )
+  if (  !strcasecmp ( lpExt, s_pAVI )  )
    retVal = SMS_CONTAINER_AVI;
-  else if (  !stricmp ( lpExt, s_pMPG  )  )
+  else if (  !strcasecmp ( lpExt, s_pMPG  )  )
    retVal = SMS_CONTAINER_MPEG_PS;
-  else if (  !stricmp ( lpExt, s_pMP3 ) ||
-             !stricmp ( lpExt, s_pMPA ) ||
-             !stricmp ( lpExt, s_pMP2 )
+  else if (  !strcasecmp ( lpExt, s_pMP3 ) ||
+             !strcasecmp ( lpExt, s_pMPA ) ||
+             !strcasecmp ( lpExt, s_pMP2 )
        ) retVal = SMS_CONTAINER_MP3;
-  else if (  !stricmp ( lpExt, s_pOGG )  )
+  else if (  !strcasecmp ( lpExt, s_pOGG )  )
    retVal = SMS_CONTAINER_OGG;
-  else if (  !stricmp ( lpExt, s_pWMA )  )
+  else if (  !strcasecmp ( lpExt, s_pWMA )  )
    retVal = SMS_CONTAINER_ASF;
-  else if (  !stricmp ( lpExt, s_pM4A ) ||
-             !stricmp ( lpExt, s_pMP4 )
+  else if (  !strcasecmp ( lpExt, s_pM4A ) ||
+             !strcasecmp ( lpExt, s_pMP4 )
        ) retVal = SMS_CONTAINER_M4A;
-  else if (  !stricmp ( lpExt, s_pAAC )  )
+  else if (  !strcasecmp ( lpExt, s_pAAC )  )
    retVal = SMS_CONTAINER_AAC;
-  else if (  !stricmp ( lpExt, s_pAC3 )  )
+  else if (  !strcasecmp ( lpExt, s_pAC3 )  )
    retVal = SMS_CONTAINER_AC3;
-  else if (  !stricmp ( lpExt, s_pM3U )  )
+  else if (  !strcasecmp ( lpExt, s_pM3U )  )
    retVal = SMS_CONTAINER_M3U;
-  else if (  !stricmp ( lpExt, s_pJPG )  )
+  else if (  !strcasecmp ( lpExt, s_pJPG )  )
    retVal = SMS_CONTAINER_JPG;
 
   if ( retVal == -1 && lLen > 5 ) {
 
-   if (  !stricmp ( --lpExt, s_pDIVX ) ||
-         !stricmp (   lpExt, s_pXVID )
+   if (  !strcasecmp ( --lpExt, s_pDIVX ) ||
+         !strcasecmp (   lpExt, s_pXVID )
    )
     retVal = SMS_CONTAINER_AVI;
-   else if (  !stricmp ( lpExt, s_pMPEG )  )
+   else if (  !strcasecmp ( lpExt, s_pMPEG )  )
     retVal = SMS_CONTAINER_MPEG_PS;
-   else if (  !stricmp ( lpExt, s_pFLAC )  )
+   else if (  !strcasecmp ( lpExt, s_pFLAC )  )
     retVal = SMS_CONTAINER_FLAC;
-   else if (  !stricmp ( lpExt, s_pJPEG )  )
+   else if (  !strcasecmp ( lpExt, s_pJPEG )  )
     retVal = SMS_CONTAINER_JPG;
 
   }  /* end if */
@@ -175,36 +178,36 @@ int SMS_FileID ( const char* apName ) {
 
   const char* lpExt = apName + lLen - 4;
 
-  if (       !stricmp ( lpExt, s_pAVI  ) ||
-             !stricmp ( lpExt, s_pMPG  )
+  if (       !strcasecmp ( lpExt, s_pAVI  ) ||
+             !strcasecmp ( lpExt, s_pMPG  )
   )
    retVal = GUICON_AVI;
-  else if (  !stricmp ( lpExt, s_pMP3 ) ||
-             !stricmp ( lpExt, s_pMPA ) ||
-             !stricmp ( lpExt, s_pMP2 ) ||
-             !stricmp ( lpExt, s_pOGG ) ||
-             !stricmp ( lpExt, s_pWMA ) ||
-             !stricmp ( lpExt, s_pM4A ) ||
-             !stricmp ( lpExt, s_pAAC ) ||
-             !stricmp ( lpExt, s_pMP4 ) ||
-             !stricmp ( lpExt, s_pAC3 )
+  else if (  !strcasecmp ( lpExt, s_pMP3 ) ||
+             !strcasecmp ( lpExt, s_pMPA ) ||
+             !strcasecmp ( lpExt, s_pMP2 ) ||
+             !strcasecmp ( lpExt, s_pOGG ) ||
+             !strcasecmp ( lpExt, s_pWMA ) ||
+             !strcasecmp ( lpExt, s_pM4A ) ||
+             !strcasecmp ( lpExt, s_pAAC ) ||
+             !strcasecmp ( lpExt, s_pMP4 ) ||
+             !strcasecmp ( lpExt, s_pAC3 )
        )
    retVal = GUICON_MP3;
-  else if (  !stricmp ( lpExt, s_pM3U )  )
+  else if (  !strcasecmp ( lpExt, s_pM3U )  )
    retVal = GUICON_M3U;
-  else if (  !stricmp ( lpExt, s_pJPG )  )
+  else if (  !strcasecmp ( lpExt, s_pJPG )  )
    retVal = GUICON_PICTURE;
 
   if ( retVal == GUICON_FILE && lLen > 5 ) {
 
-   if (  !stricmp ( --lpExt, s_pDIVX ) ||
-         !stricmp (   lpExt, s_pXVID ) ||
-         !stricmp (   lpExt, s_pMPEG )
+   if (  !strcasecmp ( --lpExt, s_pDIVX ) ||
+         !strcasecmp (   lpExt, s_pXVID ) ||
+         !strcasecmp (   lpExt, s_pMPEG )
    )
     retVal = GUICON_AVI;
-   else if (  !stricmp ( lpExt, s_pFLAC )  )
+   else if (  !strcasecmp ( lpExt, s_pFLAC )  )
     retVal = GUICON_MP3;
-   else if (  !stricmp ( lpExt, s_pJPEG )  )
+   else if (  !strcasecmp ( lpExt, s_pJPEG )  )
     retVal = GUICON_PICTURE;
 
   }  /* end if */
@@ -222,7 +225,7 @@ void SMS_FileDirInit ( char* apPath ) {
  SMS_List*     lpDirList;
  SMS_List*     lpFileList;
  SMS_List*     lpList;
- fio_dirent_t  lEntry;
+ io_dirent_t  lEntry;
  char          lPath[ 1024 ] __attribute__(   (  aligned( 4 )  )   );
  char*         lpPtr;
  SMS_ListNode* lpNode;
diff --git a/src/SMS_GS_2.c b/src/SMS_GS_2.c
index 0bd0fd62..ce27c285 100644
--- a/src/SMS_GS_2.c
+++ b/src/SMS_GS_2.c
@@ -18,7 +18,8 @@
 #include <kernel.h>
 #include <string.h>
 #include <limits.h>
-#include <fileio.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include <malloc.h>
 
 #include <lzma2.h>
diff --git a/src/SMS_GUI.c b/src/SMS_GUI.c
index 6c4005d9..25dcd5f1 100644
--- a/src/SMS_GUI.c
+++ b/src/SMS_GUI.c
@@ -36,10 +36,11 @@
 #include <kernel.h>
 #include <loadfile.h>
 #include <libhdd.h>
-#include <fileio.h>
 #include <malloc.h>
 #include <sifrpc.h>
 #include <string.h>
+#define NEWLIB_PORT_AWARE
+#include <fileio.h>
 
 #define GUIF_DEV_CHECK 0x00000001
 
diff --git a/src/SMS_GUIDesktop.c b/src/SMS_GUIDesktop.c
index 6c3da7f4..dd157051 100644
--- a/src/SMS_GUIDesktop.c
+++ b/src/SMS_GUIDesktop.c
@@ -30,6 +30,7 @@
 #include <kernel.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
 #include <libhdd.h>
 
diff --git a/src/SMS_GUIDevMenu.c b/src/SMS_GUIDevMenu.c
index 2abe138d..77a1e974 100644
--- a/src/SMS_GUIDevMenu.c
+++ b/src/SMS_GUIDevMenu.c
@@ -28,7 +28,6 @@
 
 #include <kernel.h>
 #include <malloc.h>
-#include <fileio.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/SMS_GUIFileCtxMenu.c b/src/SMS_GUIFileCtxMenu.c
index 65221951..0abb59a6 100644
--- a/src/SMS_GUIFileCtxMenu.c
+++ b/src/SMS_GUIFileCtxMenu.c
@@ -29,6 +29,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <sys/fcntl.h>
+#define NEWLIB_PORT_AWARE
+#include <fileio.h>
 
 extern void GUIMenuSMS_Redraw           ( GUIMenu*                                                        );
 extern int  CtxMenu_HandleEvent         ( GUIObject*, u64                                                 );
diff --git a/src/SMS_GUIFileMenu.c b/src/SMS_GUIFileMenu.c
index a1c89722..3e5e2505 100644
--- a/src/SMS_GUIFileMenu.c
+++ b/src/SMS_GUIFileMenu.c
@@ -31,6 +31,7 @@
 #include <kernel.h>
 #include <malloc.h>
 #include <string.h>
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
 #include <fcntl.h>
 
diff --git a/src/SMS_GUIMenuSMS.c b/src/SMS_GUIMenuSMS.c
index 73edde04..f625f7ae 100644
--- a/src/SMS_GUIMenuSMS.c
+++ b/src/SMS_GUIMenuSMS.c
@@ -33,7 +33,11 @@
 #include <kernel.h>
 #include <malloc.h>
 #include <string.h>
+#include <stdlib.h>
+#define NEWLIB_PORT_AWARE
+#include <fileio.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <libhdd.h>
 #include <sys/ioctl.h>
 #include <sifrpc.h>
diff --git a/src/SMS_GUIMiniBrowser.c b/src/SMS_GUIMiniBrowser.c
index 103c2223..efe82337 100644
--- a/src/SMS_GUIMiniBrowser.c
+++ b/src/SMS_GUIMiniBrowser.c
@@ -81,11 +81,11 @@ static void _handler ( GUIMenu* apMenu, int aDir ) {
 
   lpName = lPath + strlen ( lPath ) - 3;
 
-  if (  !stricmp ( lpName, g_pSrtStr )  )
+  if (  !strcasecmp ( lpName, g_pSrtStr )  )
 
    s_SubFmt = SubtitleFormat_SRT;
 
-  else if (  !stricmp ( lpName, g_pSubStr ) || !stricmp ( lpName, g_pTxtStr )  )
+  else if (  !strcasecmp ( lpName, g_pSubStr ) || !strcasecmp ( lpName, g_pTxtStr )  )
 
    s_SubFmt = SubtitleFormat_SUB;
 
@@ -98,9 +98,9 @@ static int _is_sub ( SMS_ListNode* apNode ) {
  int lLen = strlen (  _STR( apNode )  );
 
  return lLen > 4 && _STR( apNode )[ lLen - 4 ] == '.' &&
-        (  !stricmp (  _STR( apNode ) + lLen - 3, g_pSubStr  ) ||
-           !stricmp (  _STR( apNode ) + lLen - 3, g_pSrtStr  ) ||
-           !stricmp (  _STR( apNode ) + lLen - 3, g_pTxtStr  )
+        (  !strcasecmp (  _STR( apNode ) + lLen - 3, g_pSubStr  ) ||
+           !strcasecmp (  _STR( apNode ) + lLen - 3, g_pSrtStr  ) ||
+           !strcasecmp (  _STR( apNode ) + lLen - 3, g_pTxtStr  )
         ) && apNode -> m_Param == GUICON_FILE;
 
 }  /* end _is_sub */
diff --git a/src/SMS_GUISMBrowser.c b/src/SMS_GUISMBrowser.c
index 3eebc5d4..0736b1c6 100644
--- a/src/SMS_GUISMBrowser.c
+++ b/src/SMS_GUISMBrowser.c
@@ -18,6 +18,7 @@
 
 #include <malloc.h>
 #include <string.h>
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
 
 typedef struct SMBInfo {
diff --git a/src/SMS_GUInfoPanel.c b/src/SMS_GUInfoPanel.c
index 5323d61b..44e5cce9 100644
--- a/src/SMS_GUInfoPanel.c
+++ b/src/SMS_GUInfoPanel.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 extern SMS_Player s_Player;
 
@@ -121,7 +122,7 @@ GUIObject* SMS_GUInfo ( SMS_Container* apCont ) {
   sprintf ( lpPtr, g_pFmt0, lpCodec -> m_BitRate / 1000, STR_KbS.m_pStr, lpCodec -> m_SampleRate, STR_Hz.m_pStr, lpCodec -> m_Channels, STR_Ch.m_pStr );
  }  /* end if */
 
- sprintf ( lMemory, STR_AVAILABLE_MEMORY.m_pStr, (  32 * 1024 * 1024 - ( int )ps2_sbrk ( 0 )  ) / ( 1024.0F * 1024.0F ), ( float )SMS_IOPQueryTotalFreeMemSize () / ( 1024.0F * 1024.0F )  );
+ sprintf ( lMemory, STR_AVAILABLE_MEMORY.m_pStr, (  32 * 1024 * 1024 - ( int )sbrk ( 0 )  ) / ( 1024.0F * 1024.0F ), ( float )SMS_IOPQueryTotalFreeMemSize () / ( 1024.0F * 1024.0F )  );
 
  lGB   = strlen ( lVideo  );
  lMB   = strlen ( lAudio  );
diff --git a/src/SMS_History.c b/src/SMS_History.c
index d6b6baee..714503fb 100644
--- a/src/SMS_History.c
+++ b/src/SMS_History.c
@@ -13,8 +13,11 @@
 #include "SMS_List.h"
 #include "SMS_MC.h"
 
-#include <fileio.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
+#define NEWLIB_PORT_AWARE
+#include <fileio.h>
 
 #define HIST_SIZE 32
 
diff --git a/src/SMS_IOP.c b/src/SMS_IOP.c
index 30ddaab6..53589bb5 100644
--- a/src/SMS_IOP.c
+++ b/src/SMS_IOP.c
@@ -32,11 +32,16 @@
 #include <sifrpc.h>
 #include <iopheap.h>
 #include <iopcontrol.h>
+#include <stdlib.h>
+#include <malloc.h>
 #include <loadfile.h>
 #include <sbv_patches.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <fcntl.h>
+#define NEWLIB_PORT_AWARE
+#include <fileio.h>
 
 #include <lzma2.h>
 
diff --git a/src/SMS_List.c b/src/SMS_List.c
index cb2eec38..4d87c307 100644
--- a/src/SMS_List.c
+++ b/src/SMS_List.c
@@ -311,7 +311,7 @@ SMS_ListNode* SMS_ListFind ( SMS_List* apList, const char* apStr ) {
 
 SMS_ListNode* SMS_ListFindI ( SMS_List* apList, const char* apStr ) {
 
- return _find ( apList, apStr, stricmp );
+ return _find ( apList, apStr, strcasecmp );
 
 }  /* end SMS_ListFindI */
 
diff --git a/src/SMS_Locale.c b/src/SMS_Locale.c
index 50704ae4..c1ad5ab1 100644
--- a/src/SMS_Locale.c
+++ b/src/SMS_Locale.c
@@ -15,7 +15,8 @@
 #include "SMS_MC.h"
 
 #include <string.h>
-#include <fileio.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include <malloc.h>
 
 char g_SMSLng[ 12 ] __attribute__(   (  aligned( 1 ), section( ".data" )  )   ) = "SMS/SMS.lng";
diff --git a/src/SMS_MPEG12.c b/src/SMS_MPEG12.c
index 989a9b38..fa7b9723 100644
--- a/src/SMS_MPEG12.c
+++ b/src/SMS_MPEG12.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <kernel.h>
 #include <string.h>
+#include <stdlib.h>
 
 typedef struct MPEGState {
 
diff --git a/src/SMS_MPEG4.c b/src/SMS_MPEG4.c
index 033d69b7..26c97540 100644
--- a/src/SMS_MPEG4.c
+++ b/src/SMS_MPEG4.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #define BASECTX() g_MPEGCtx
 
diff --git a/src/SMS_Player.c b/src/SMS_Player.c
index a6fb2b6d..daa22195 100644
--- a/src/SMS_Player.c
+++ b/src/SMS_Player.c
@@ -46,6 +46,7 @@
 
 #include <kernel.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <limits.h>
 #include <libhdd.h>
 #include <string.h>
diff --git a/src/SMS_PlayerControl.c b/src/SMS_PlayerControl.c
index 2c53f477..825c8146 100644
--- a/src/SMS_PlayerControl.c
+++ b/src/SMS_PlayerControl.c
@@ -35,6 +35,7 @@
 
 #include <kernel.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 
diff --git a/src/SMS_RC.c b/src/SMS_RC.c
index 4fbfa7b2..87ded67d 100644
--- a/src/SMS_RC.c
+++ b/src/SMS_RC.c
@@ -14,7 +14,10 @@
 #include "SMS_RC.h"
 #include "SMS_SIF.h"
 
+#define NEWLIB_PORT_AWARE
 #include <fileio.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
 #include <malloc.h>
 #include <loadfile.h>
diff --git a/src/SMS_SubtitleContext.c b/src/SMS_SubtitleContext.c
index b1ee6931..79fe4dd7 100644
--- a/src/SMS_SubtitleContext.c
+++ b/src/SMS_SubtitleContext.c
@@ -27,6 +27,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include <limits.h>
 #include <mbstring.h>
 
diff --git a/src/main.c b/src/main.c
index bed3e102..6c852ab0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,6 @@
 #include "SMS_VIF.h"
 #include <kernel.h>
 #include <sys/ioctl.h>
-#include <fileio.h>
 
 #ifdef DISABLE_EXTRA_TIMERS_FUNCTIONS
 DISABLE_EXTRA_TIMERS_FUNCTIONS();