diff --git a/SDL3_Core b/SDL3_Core
index dc0a1f3..af46238 160000
--- a/SDL3_Core
+++ b/SDL3_Core
@@ -1 +1 @@
-Subproject commit dc0a1f36568146b8b9dd86fd2e7634464280179b
+Subproject commit af462380762093bee9e471799c7ce31732a4b248
diff --git a/src/components/headers/animation_system.h b/src/components/headers/animation_system.h
index 7f8ad11..b1cd817 100644
--- a/src/components/headers/animation_system.h
+++ b/src/components/headers/animation_system.h
@@ -1,6 +1,7 @@
 #ifndef ANIMATION_SYSTEM_H
 #define ANIMATION_SYSTEM_H
 
+#include <stdbool.h>
 #include "ecs.h"
 #include "sprite_component.h"
 
diff --git a/src/components/headers/hitbox_component.h b/src/components/headers/hitbox_component.h
index e607822..67d1f94 100644
--- a/src/components/headers/hitbox_component.h
+++ b/src/components/headers/hitbox_component.h
@@ -1,6 +1,7 @@
 #ifndef HITBOX_COMPONENT_H
 #define HITBOX_COMPONENT_H
 
+#include <stdbool.h>
 #include "ecs.h"
 #include "transform_component.h"
 #include "vector2d.h"
@@ -10,6 +11,7 @@ typedef struct hitbox_component_data_t {
     fvector2d_t position;
     fvector2d_t scale;
     frect_t bounds;
+    bool activated;
 } hitbox_component_data_t;
 
 int hitbox_component_init(component_t *component);
diff --git a/src/components/hitbox_component.c b/src/components/hitbox_component.c
index a3bdd12..4176eb9 100644
--- a/src/components/hitbox_component.c
+++ b/src/components/hitbox_component.c
@@ -22,6 +22,8 @@ int hitbox_component_init(component_t *component)
         .y = 1.0f
     };
 
+    component_data->activated = true;
+
     return EXIT_SUCCESS;
 }
 
diff --git a/src/components/player_system.c b/src/components/player_system.c
index 67a6f11..ca48619 100644
--- a/src/components/player_system.c
+++ b/src/components/player_system.c
@@ -7,7 +7,7 @@
 #include "transform_component.h"
 
 // No args
-int player_system_init(component_t *component)
+inline int player_system_init(component_t *component)
 {
     player_system_data_t *system_data = component->component_data;
 
@@ -126,7 +126,7 @@ static inline int player_system_set_animation_and_speed(player_system_data_t *sy
     return EXIT_SUCCESS;
 }
 
-int player_system_update(component_t *component)
+inline int player_system_update(component_t *component)
 {
     player_system_data_t *system_data = component->component_data;
 
@@ -137,7 +137,7 @@ int player_system_update(component_t *component)
     return EXIT_SUCCESS;
 }
 
-int player_system_destroy(component_t *component)
+inline int player_system_destroy(component_t *component)
 {
     player_system_data_t *component_data = component->component_data;
 
diff --git a/src/components/sprite_component.c b/src/components/sprite_component.c
index f3c7df8..226da2d 100644
--- a/src/components/sprite_component.c
+++ b/src/components/sprite_component.c
@@ -5,7 +5,7 @@
 #include "game.h"
 
 // Arg : const char *name
-int sprite_component_init(component_t *component)
+inline int sprite_component_init(component_t *component)
 {
     sprite_component_data_t *component_data = component->component_data;
 
diff --git a/src/components/transform_component.c b/src/components/transform_component.c
index fe99727..048c596 100644
--- a/src/components/transform_component.c
+++ b/src/components/transform_component.c
@@ -25,7 +25,7 @@ int transform_component_init(component_t *component)
     return EXIT_SUCCESS;
 }
 
-int transform_component_update(component_t *component)
+inline int transform_component_update(component_t *component)
 {
     transform_component_data_t *component_data = component->component_data;
 
@@ -39,7 +39,7 @@ int transform_component_update(component_t *component)
 #include "display.h"
 #include "errors.h"
 
-int transform_component_draw(component_t *component)
+inline int transform_component_draw(component_t *component)
 {
     transform_component_data_t *component_data = component->component_data;