diff --git a/src/Makefile b/src/Makefile
index 97551c4..2b7790e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,7 +10,7 @@ CORE_SOURCES := \
 # Compiler and flags
 CORE_CC = gcc
 #CORE_CFLAGS = -std=c17 -pedantic -O3 -fPIC -DASSET_FILENAME=$(ASSET_OUTPUT) # RELEASE
-CORE_CFLAGS = -std=c17 --pedantic -O0 -g -fPIC -DASSET_FILENAME=$(BUILD_DIR)/$(ASSET_OUTPUT) \
+CORE_CFLAGS = -std=c17 --pedantic -g -fPIC -DASSET_FILENAME=$(BUILD_DIR)/$(ASSET_OUTPUT) $(shell pkg-config --cflags sdl2 SDL2_image) \
 	-Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \
     -Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \
     -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
@@ -20,7 +20,7 @@ CORE_CFLAGS = -std=c17 --pedantic -O0 -g -fPIC -DASSET_FILENAME=$(BUILD_DIR)/$(A
     -Wold-style-definition # DEVELOPEMENT
 
 CORE_INCLUDE_DIRS = $(CORE_DIR)/headers
-CORE_LDFLAGS = $(shell sdl2-config --cflags --libs) -lSDL2_image $(shell pkg-config --libs liblz4) -ltar
+CORE_LDFLAGS = $(shell pkg-config --libs sdl2 SDL2_image)
 
 # Deduce objects
 CORE_OBJECTS = $(CORE_SOURCES:%.c=$(BUILD_DIR)/$(CORE_DIR)/%.o)
diff --git a/src/headers/asset_manager.h b/src/headers/asset_manager.h
index 948f129..c433493 100644
--- a/src/headers/asset_manager.h
+++ b/src/headers/asset_manager.h
@@ -1,11 +1,11 @@
 #ifndef ASSET_MANAGER_H
 #define ASSET_MANAGER_H
 
-#include <SDL2/SDL_image.h>
+#include "texture_manager.h"
 
 void asset_manager_init(void);
 void asset_manager_exit(void);
 
-SDL_Texture load_image(const char *path);
+texture_t *load_image(const char *path);
 
 #endif // ASSET_MANAGER_H
\ No newline at end of file