diff --git a/.cppcheck-suppress b/.cppcheck-suppress
index adbdd62..aeffa52 100644
--- a/.cppcheck-suppress
+++ b/.cppcheck-suppress
@@ -2,7 +2,6 @@
 # Suppress warnings for third-party code and headers
 
 # Third-party libraries that we don't modify
-*:lib/giflib/*
 *:lib/libintraFont/*
 *:lib/libpspmath/*
 
diff --git a/.gitmodules b/.gitmodules
index e9c5f5f..59082d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/giflib"]
-	path = lib/giflib
-	url = https://git.code.sf.net/p/giflib/code
 [submodule "lib/libintraFont"]
 	path = lib/libintraFont
 	url = https://github.com/pspdev/libintraFont
diff --git a/.uncrustifyignore b/.uncrustifyignore
index 606b280..4942dc5 100644
--- a/.uncrustifyignore
+++ b/.uncrustifyignore
@@ -1,3 +1,2 @@
-lib/giflib/
 lib/libintraFont/
 lib/libpspmath/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02d2038..8e80ebd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,14 +26,12 @@ set_target_properties(${TARGET_LIB} PROPERTIES
 include_directories(
     INTERFACE PUBLIC_HEADER  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib/libintraFont/include>
     INTERFACE PUBLIC_HEADER  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib/libpspmath/include>
-    INTERFACE PRIVATE_HEADER $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib/giflib>
     src
     src/adhoc
 )
 
 # Treat third-party library directories as system includes to suppress warnings
 include_directories(SYSTEM
-    ${PROJECT_SOURCE_DIR}/lib/giflib
     ${PROJECT_SOURCE_DIR}/lib/libintraFont/include
     ${PROJECT_SOURCE_DIR}/lib/libpspmath/include
 )
@@ -89,14 +87,6 @@ set(PSPMATH_SOURCES
     lib/libpspmath/src/vfpu_quaternion_sample_hermite.c
     lib/libpspmath/src/vfpu_quaternion_hermite_tangent.c
 )
-set(GIFLIB_SOURCES
-    lib/giflib/gif2rgb.c
-    lib/giflib/dgif_lib.c
-    lib/giflib/egif_lib.c
-    lib/giflib/gif_err.c
-    lib/giflib/gifalloc.c
-    lib/giflib/quantize.c
-)
 set(INTRAFONT_SOURCES
     lib/libintraFont/src/intraFont.c
     lib/libintraFont/src/libccc.c
@@ -156,7 +146,6 @@ set_source_files_properties(${SOURCE_DIR}/stub.S PROPERTIES LANGUAGE ASM)
 # Suppress warnings for third-party library sources
 set_source_files_properties(
     ${PSPMATH_SOURCES}
-    ${GIFLIB_SOURCES}
     ${INTRAFONT_SOURCES}
     PROPERTIES
     COMPILE_FLAGS "-w"
@@ -166,7 +155,6 @@ set_source_files_properties(
 target_sources(${TARGET_LIB} PRIVATE
     ${SFONT_SOURCES}
     ${PSPMATH_SOURCES}
-    ${GIFLIB_SOURCES}
     ${INTRAFONT_SOURCES}
     ${LIB_SOURCES}
 )
diff --git a/Makefile b/Makefile
index 0525443..cae8602 100644
--- a/Makefile
+++ b/Makefile
@@ -78,14 +78,6 @@ INTRAFONTOBJS := \
 	$(LIB_DIR)/libintraFont/src/intraFont.o \
 	$(LIB_DIR)/libintraFont/src/libccc.o
 
-GIFLIBOBJS := \
-	$(LIB_DIR)/giflib/gif2rgb.o \
-	$(LIB_DIR)/giflib/dgif_lib.o \
-	$(LIB_DIR)/giflib/egif_lib.o \
-	$(LIB_DIR)/giflib/gif_err.o \
-	$(LIB_DIR)/giflib/gifalloc.o \
-	$(LIB_DIR)/giflib/quantize.o
-
 LIBOBJS := \
 	$(SFONTOBJS) \
 	$(PSPMATHOBJS) \
@@ -131,12 +123,12 @@ LIBOBJS := \
 	$(SOURCE_DIR)/image/format/oslLoadImageFilePNG.o \
 	$(SOURCE_DIR)/image/format/oslWriteImageFilePNG.o \
 	$(SOURCE_DIR)/image/format/oslLoadImageFileJPEG.o \
-	$(SOURCE_DIR)/image/format/oslLoadImageFileGIF.o \
 	$(SOURCE_DIR)/image/oslLoadImageFile.o \
 	$(SOURCE_DIR)/image/oslWriteImageFile.o \
 	$(SOURCE_DIR)/splash/oslShowSplashScreen1.o \
 	$(SOURCE_DIR)/splash/oslShowSplashScreen2.o \
 	$(SOURCE_DIR)/mem/oslGetRamStatus.o
+#	$(SOURCE_DIR)/image/format/oslLoadImageFileGIF.o
 
 OBJS := $(LIBOBJS) $(INTRAFONTOBJS) $(GIFLIBOBJS)
 
@@ -147,7 +139,6 @@ OBJS := $(LIBOBJS) $(INTRAFONTOBJS) $(GIFLIBOBJS)
 INCDIR := $(INCDIR) \
 	$(SOURCE_DIR) \
 	$(LIB_DIR)/libintraFont/include \
-	$(LIB_DIR)/giflib \
 	$(LIB_DIR)/libpspmath/include
 
 #----------------------------------------------------------------------------
@@ -182,8 +173,8 @@ DEFINES := \
 	-DPSP \
 	-DOSL_IMAGE_LOADER_PNG \
 	-DOSL_IMAGE_LOADER_JPEG \
-	-DOSL_IMAGE_LOADER_GIF \
 	-DOSL_IMAGE_WRITER_PNG
+#	-DOSL_IMAGE_LOADER_GIF
 
 #----------------------------------------------------------------------------
 #   Compiler settings
@@ -289,10 +280,6 @@ ghpages: gendoc
 $(PSPMATHOBJS): %.o: %.c
 	$(CC) $(CFLAGS_THIRD_PARTY) $(addprefix -I,$(INCDIR)) -c $< -o $@
 
-# giflib objects
-$(GIFLIBOBJS): %.o: %.c
-	$(CC) $(CFLAGS_THIRD_PARTY) $(addprefix -I,$(INCDIR)) -c $< -o $@
-
 # libintraFont objects
 $(INTRAFONTOBJS): %.o: %.c
 	$(CC) $(CFLAGS_THIRD_PARTY) $(addprefix -I,$(INCDIR)) -c $< -o $@
diff --git a/cmake/IMG.cmake b/cmake/IMG.cmake
index 4995d62..c5e2cce 100644
--- a/cmake/IMG.cmake
+++ b/cmake/IMG.cmake
@@ -44,11 +44,15 @@ foreach(IMAGE_FORMAT ${OSL_IMAGE_FORMATS_AVAILABLE})
 		list(APPEND OSL_IMAGE_FORMATS_SUPPORTED ${IMAGE_FORMAT})
 		if(${IMAGE_FORMAT} IN_LIST OSL_IMAGE_FORMAT_LOADERS)
 			add_compile_definitions(-DOSL_IMAGE_LOADER_${IMAGE_FORMAT})
-			include_directories(${${IMAGE_FORMAT}_INCLUDE_DIRS})
+			include_directories(PUBLIC ${${IMAGE_FORMAT}_INCLUDE_DIRS})
+			link_directories(PUBLIC ${${IMAGE_FORMAT}_LIBRARY_DIRS})
+			link_libraries(PUBLIC ${${IMAGE_FORMAT}_LIBRARIES})
 		endif()
 		if(${IMAGE_FORMAT} IN_LIST OSL_IMAGE_FORMAT_WRITERS)
 			add_compile_definitions(-DOSL_IMAGE_WRITER_${IMAGE_FORMAT})
-			include_directories(${${IMAGE_FORMAT}_INCLUDE_DIRS})
+			include_directories(PUBLIC ${${IMAGE_FORMAT}_INCLUDE_DIRS})
+			link_directories(PUBLIC ${${IMAGE_FORMAT}_LIBRARY_DIRS})
+			link_libraries(PUBLIC ${${IMAGE_FORMAT}_LIBRARIES})
 		endif()
 	else()
 		list(REMOVE_ITEM OSL_IMAGE_FORMAT_WRITERS ${IMAGE_FORMAT})
diff --git a/lib/giflib b/lib/giflib
deleted file mode 160000
index 8bed392..0000000
--- a/lib/giflib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8bed392c280ad2c237e8bf1beca6f8f68f893e87
diff --git a/samples/OSK/makefile b/samples/OSK/makefile
index aff695f..7adbed5 100644
--- a/samples/OSK/makefile
+++ b/samples/OSK/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/adhoc/makefile b/samples/adhoc/makefile
index 07c970f..9ed3d50 100644
--- a/samples/adhoc/makefile
+++ b/samples/adhoc/makefile
@@ -5,13 +5,19 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS= -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan -lm
 LIBS=$(STDLIBS) $(MYLIBS)
 
diff --git a/samples/dialog/makefile b/samples/dialog/makefile
index 36d0c79..47d261b 100644
--- a/samples/dialog/makefile
+++ b/samples/dialog/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/helloWorld/makefile b/samples/helloWorld/makefile
index 233caec..a66a985 100644
--- a/samples/helloWorld/makefile
+++ b/samples/helloWorld/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/internetBrowser/makefile b/samples/internetBrowser/makefile
index b1fbce7..e4a0fc4 100644
--- a/samples/internetBrowser/makefile
+++ b/samples/internetBrowser/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/intraFont/makefile b/samples/intraFont/makefile
index 34a4352..02b3eed 100644
--- a/samples/intraFont/makefile
+++ b/samples/intraFont/makefile
@@ -1,8 +1,15 @@
 TARGET = testIntraFont
 OBJS = main.o
 
+
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 INCDIR =
-CFLAGS = -O2 -g -G0 -Wall
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 
@@ -13,9 +20,9 @@ LIBDIR =
 LDFLAGS =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 EXTRA_TARGETS = EBOOT.PBP
diff --git a/samples/map/makefile b/samples/map/makefile
index 52f8f30..d3abc37 100644
--- a/samples/map/makefile
+++ b/samples/map/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/net/makefile b/samples/net/makefile
index 9763e58..f7f2eeb 100644
--- a/samples/net/makefile
+++ b/samples/net/makefile
@@ -5,15 +5,22 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/rectAndFonts/makefile b/samples/rectAndFonts/makefile
index d03be60..1d93f32 100644
--- a/samples/rectAndFonts/makefile
+++ b/samples/rectAndFonts/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/saveAndLoad/makefile b/samples/saveAndLoad/makefile
index 34917e5..be4fc85 100644
--- a/samples/saveAndLoad/makefile
+++ b/samples/saveAndLoad/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/sfont/makefile b/samples/sfont/makefile
index 5380464..2f01d30 100644
--- a/samples/sfont/makefile
+++ b/samples/sfont/makefile
@@ -5,15 +5,21 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/samples/shapes/makefile b/samples/shapes/makefile
index a7fe7e1..4b788db 100644
--- a/samples/shapes/makefile
+++ b/samples/shapes/makefile
@@ -5,15 +5,22 @@ OBJS = main.o
 BUILD_PRX = 1
 PSP_FW_VERSION=371
 
-CFLAGS = -O2 -g -G0 -Wall
+
+DEFINES := \
+	-DPSP \
+	-DOSL_IMAGE_LOADER_PNG \
+	-DOSL_IMAGE_LOADER_JPEG \
+	-DOSL_IMAGE_WRITER_PNG
+
+CFLAGS = -O2 -g -G0 -Wall ${DEFINES}
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 LIBDIR =
 
 MYLIBS=
-STDLIBS= -losl -lpng -lz \
+STDLIBS= -lm -losl -lpng -ljpeg -lz \
          -lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum  -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
-         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
+         -lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
 LIBS=$(STDLIBS) $(MYLIBS)
 
 LDFLAGS =
diff --git a/src/image/format/oslLoadImageFileGIF.c b/src/image/format/oslLoadImageFileGIF.c
index 4846ec5..ec29a17 100644
--- a/src/image/format/oslLoadImageFileGIF.c
+++ b/src/image/format/oslLoadImageFileGIF.c
@@ -1,4 +1,5 @@
 #include "oslib.h"
+#ifdef OSL_IMAGE_LOADER_GIF
 #include "gif_lib.h"
 
 /*
@@ -180,3 +181,4 @@ OSL_IMAGE *oslLoadImageFileGIF(char *filename, int location, int pixelFormat)
 
 	return img;
 }
+#endif
diff --git a/src/image/format/oslWriteImageFilePNG.c b/src/image/format/oslWriteImageFilePNG.c
index 8329306..58049dd 100644
--- a/src/image/format/oslWriteImageFilePNG.c
+++ b/src/image/format/oslWriteImageFilePNG.c
@@ -4,9 +4,12 @@
 #include <zlib.h>
 #include <zconf.h>
 
-void oslPngFlushFn(png_structp png_ptr);
+static void oslPngFlushFn(png_structp png_ptr) {
+	(void)png_ptr; // Suppress unused parameter warning
+	// No operation
+}
 
-void oslPngWriteFn(png_structp png_ptr, png_bytep data, png_size_t length) {
+static void oslPngWriteFn(png_structp png_ptr, png_bytep data, png_size_t length) {
 	VIRTUAL_FILE *f = (VIRTUAL_FILE*)png_get_io_ptr(png_ptr);
 	VirtualFileWrite(data, length, 1, f);
 }
diff --git a/src/saveload.c b/src/saveload.c
index f990b0a..cc4e312 100644
--- a/src/saveload.c
+++ b/src/saveload.c
@@ -10,7 +10,7 @@
 
 SceUtilitySavedataParam savedata;
 PspUtilitySavedataListSaveNewData newData;
-char key[] = "QTAK319JQKJ952HA";
+__attribute__((nonstring)) char key[] = "QTAK319JQKJ952HA";
 int saveLoadType = OSL_DIALOG_NONE;
 
 void oslInitSaveDialog(struct oslSaveLoad *saveData){