diff --git a/source/animated_sprite.cpp b/source/animated_sprite.cpp
index 17019db..71222a0 100644
--- a/source/animated_sprite.cpp
+++ b/source/animated_sprite.cpp
@@ -1,11 +1,15 @@
 #include "animated_sprite.h"
+
 #include <SDL3/SDL.h> // Para SDL_LogWarn, SDL_LogCategory, SDL_LogError
 #include <stddef.h>	  // Para size_t
-#include <fstream>	  // Para basic_istream, basic_ifstream, basic_ios
+#include <algorithm>  // Para min
+#include <fstream>	  // Para basic_istream, basic_ifstream, basic_ios, ifst...
 #include <sstream>	  // Para basic_stringstream
 #include <stdexcept>  // Para runtime_error
-#include "texture.h"  // Para Texture
-#include "utils.h"	  // Para printWithDots
+#include <utility>	  // Para pair
+
+#include "texture.h" // Para Texture
+#include "utils.h"	 // Para printWithDots
 
 // Carga las animaciones en un vector(Animations) desde un fichero
 AnimationsFileBuffer loadAnimationsFromFile(const std::string &file_path)
diff --git a/source/animated_sprite.h b/source/animated_sprite.h
index 351a492..22b858d 100644
--- a/source/animated_sprite.h
+++ b/source/animated_sprite.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include <SDL3/SDL.h>
-#include <memory>
-#include <string>
-#include <vector>
-#include <unordered_map>
+#include <SDL3/SDL.h>    // Para SDL_FRect
+#include <stddef.h>      // Para size_t
+#include <memory>        // Para shared_ptr
+#include <string>        // Para basic_string, string, hash
+#include <unordered_map> // Para unordered_map
+#include <vector>        // Para vector
 
-#include "moving_sprite.h"
+#include "moving_sprite.h" // Para MovingSprite
 
 // Declaración adelantada
 class Texture;
diff --git a/source/asset.cpp b/source/asset.cpp
index 1cff5dc..2ef067b 100644
--- a/source/asset.cpp
+++ b/source/asset.cpp
@@ -1,8 +1,10 @@
 #include "asset.h"
+
 #include <SDL3/SDL.h> // Para SDL_LogInfo, SDL_LogCategory, SDL_LogError
 #include <algorithm>  // Para find_if, max
 #include <fstream>    // Para basic_ifstream, ifstream
 #include <string>     // Para allocator, string, char_traits, operator+
+
 #include "utils.h"    // Para getFileName
 
 // Singleton
diff --git a/source/asset.h b/source/asset.h
index 1a6c381..3b698f7 100644
--- a/source/asset.h
+++ b/source/asset.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <string>
-#include <vector>
-#include <memory>
-#include <iostream>
-#include "utils.h"
+#include <string> // Para string, basic_string
+#include <vector> // Para vector
 
 // Tipos de recursos gestionados por Asset
 enum class AssetType : int
diff --git a/source/audio.cpp b/source/audio.cpp
index e6f07a5..4ec56d6 100644
--- a/source/audio.cpp
+++ b/source/audio.cpp
@@ -1,8 +1,11 @@
 #include "audio.h"
-#include "external/jail_audio.h"
-#include "options.h"
-#include "resource.h"
-#include <SDL3/SDL.h>
+
+#include <SDL3/SDL.h> // Para SDL_LogInfo, SDL_LogCategory, SDL_G...
+#include <algorithm>  // Para clamp
+
+#include "external/jail_audio.h" // Para JA_FadeOutMusic, JA_Init, JA_PauseM...
+#include "options.h"             // Para AudioOptions, audio, MusicOptions
+#include "resource.h"            // Para Resource
 
 // Singleton
 Audio *Audio::instance_ = nullptr;
diff --git a/source/background.cpp b/source/background.cpp
index 750080c..3967fe5 100644
--- a/source/background.cpp
+++ b/source/background.cpp
@@ -1,9 +1,11 @@
 #define _USE_MATH_DEFINES
 #include "background.h"
-#include <SDL3/SDL.h> // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h> // Para SDL_PIXELFORMAT_RGBA8888
+
+#include <SDL3/SDL.h> // Para SDL_SetRenderTarget, SDL_FRect, SDL_Creat...
 #include <algorithm>  // Para clamp, max
-#include <cmath>
+#include <cmath>      // Para cos, sin, M_PI
+#include <string>     // Para basic_string
+
 #include "moving_sprite.h" // Para MovingSprite
 #include "param.h"         // Para Param, ParamBackground, param
 #include "resource.h"      // Para Resource
diff --git a/source/background.h b/source/background.h
index 3ba92f0..b1e2d65 100644
--- a/source/background.h
+++ b/source/background.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect, SDL_FPoint
-#include <SDL3/SDL.h> // Para SDL_Texture, SDL_Renderer
+#include <SDL3/SDL.h> // Para SDL_FRect, SDL_FPoint, SDL_Texture, SDL_Renderer
 #include <stddef.h>   // Para size_t
 #include <memory>     // Para unique_ptr, shared_ptr
 #include <vector>     // Para vector
-#include "utils.h"    // Para Color
+
+#include "utils.h" // Para Color
 
 class MovingSprite;
 class Sprite;
diff --git a/source/balloon.cpp b/source/balloon.cpp
index 6a1bc81..b378e4f 100644
--- a/source/balloon.cpp
+++ b/source/balloon.cpp
@@ -1,12 +1,14 @@
 #include "balloon.h"
-#include <algorithm>		 // Para clamp
-#include <cmath>			 // Para fabs
+
+#include <algorithm> // Para clamp
+#include <array>	 // Para array
+#include <cmath>	 // Para fabs
+
 #include "animated_sprite.h" // Para AnimatedSprite
-#include "param.h"			 // Para Param, param, ParamBalloon, ParamGame
+#include "audio.h"			 // Para Audio
+#include "param.h"			 // Para Param, ParamBalloon, param
 #include "sprite.h"			 // Para Sprite
 #include "texture.h"		 // Para Texture
-#include "resource.h"
-#include "audio.h"
 
 // Constructor
 Balloon::Balloon(float x, float y, BalloonType type, BalloonSize size, float vel_x, float speed, Uint16 creation_timer, SDL_FRect play_area, std::shared_ptr<Texture> texture, const std::vector<std::string> &animation)
diff --git a/source/balloon.h b/source/balloon.h
index 3dc0a26..4c8a0a3 100644
--- a/source/balloon.h
+++ b/source/balloon.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h>		 // Para SDL_FRect
-#include <SDL3/SDL.h>		 // Para Uint8, Uint16, Uint32
-#include <memory>			 // Para shared_ptr, unique_ptr
-#include <string>			 // Para string
-#include <vector>			 // Para vector
+#include <SDL3/SDL.h> // Para Uint8, Uint16, SDL_FRect, Uint32
+#include <memory>	  // Para shared_ptr, unique_ptr
+#include <string>	  // Para basic_string, string
+#include <vector>	  // Para vector
+
 #include "animated_sprite.h" // Para AnimatedSprite
 #include "utils.h"			 // Para Circle
 
diff --git a/source/balloon_formations.cpp b/source/balloon_formations.cpp
index d8e80a9..d6e59a1 100644
--- a/source/balloon_formations.cpp
+++ b/source/balloon_formations.cpp
@@ -1,4 +1,5 @@
 #include "balloon_formations.h"
+
 #include "balloon.h" // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
 #include "param.h"	 // Para param
 #include "utils.h"	 // Para ParamGame, Param, Zone, BLOCK
diff --git a/source/balloon_formations.h b/source/balloon_formations.h
index ac4a3c6..bc7dc06 100644
--- a/source/balloon_formations.h
+++ b/source/balloon_formations.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "balloon.h" // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
 #include <vector>
 
+#include "balloon.h" // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
+
 // --- Constantes de configuración ---
 constexpr int NUMBER_OF_BALLOON_FORMATIONS = 100;
 constexpr int MAX_NUMBER_OF_BALLOONS_IN_A_FORMATION = 50;
diff --git a/source/balloon_manager.cpp b/source/balloon_manager.cpp
index eb09fc8..0beed7c 100644
--- a/source/balloon_manager.cpp
+++ b/source/balloon_manager.cpp
@@ -1,7 +1,9 @@
 #include "balloon_manager.h"
+
 #include <stdlib.h>             // Para rand
 #include <algorithm>            // Para remove_if
 #include <numeric>              // Para accumulate
+
 #include "balloon.h"            // Para Balloon, BALLOON_SCORE, BALLOON_VELX...
 #include "balloon_formations.h" // Para BalloonFormationParams, BalloonForma...
 #include "explosions.h"         // Para Explosions
diff --git a/source/balloon_manager.h b/source/balloon_manager.h
index 19e16e8..ad4f2fb 100644
--- a/source/balloon_manager.h
+++ b/source/balloon_manager.h
@@ -4,11 +4,13 @@
 #include <memory>               // Para shared_ptr, unique_ptr
 #include <string>               // Para string
 #include <vector>               // Para vector
+
 #include "balloon.h"            // Para BALLOON_SPEED, Balloon
 #include "balloon_formations.h" // Para BalloonFormations
 #include "explosions.h"         // Para Explosions
 #include "param.h"              // Para Param, ParamGame, param
 #include "utils.h"              // Para Zone
+
 class Texture;
 
 using Balloons = std::vector<std::shared_ptr<Balloon>>;
diff --git a/source/bullet.cpp b/source/bullet.cpp
index 2fad48b..341f6cb 100644
--- a/source/bullet.cpp
+++ b/source/bullet.cpp
@@ -1,10 +1,10 @@
 #include "bullet.h"
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <memory>     // Para unique_ptr, make_unique, shared_ptr
+
+#include <memory> // Para allocator, unique_ptr, make_unique
+#include <string> // Para char_traits, basic_string, operator+, string
+
 #include "param.h"    // Para Param, ParamGame, param
-#include "sprite.h"   // Para Sprite
-#include "resource.h"
-class Texture; // lines 5-5
+#include "resource.h" // Para Resource
 
 // Constructor
 Bullet::Bullet(float x, float y, BulletType bullet_type, bool powered, int owner)
diff --git a/source/bullet.h b/source/bullet.h
index 1fd00fd..6415d88 100644
--- a/source/bullet.h
+++ b/source/bullet.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h>		 // Para Uint8
-#include <memory>			 // Para shared_ptr, unique_ptr
+#include <SDL3/SDL.h> // Para Uint8
+#include <memory>	  // Para unique_ptr
+
 #include "animated_sprite.h" // Para AnimatedSprite
 #include "utils.h"			 // Para Circle
-class Texture;
 
 // Tipos de balas
 enum class BulletType : Uint8
diff --git a/source/define_buttons.cpp b/source/define_buttons.cpp
index 1d7243d..b6b25c6 100644
--- a/source/define_buttons.cpp
+++ b/source/define_buttons.cpp
@@ -1,4 +1,5 @@
 #include "define_buttons.h"
+
 #include "input.h"    // Para Input, InputAction
 #include "lang.h"     // Para getText
 #include "options.h"  // Para OptionsController, Options, options
diff --git a/source/define_buttons.h b/source/define_buttons.h
index 2e9f04e..5de6465 100644
--- a/source/define_buttons.h
+++ b/source/define_buttons.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_Event, SDL_GamepadButtonEvent
-#include <SDL3/SDL.h> // Para SDL_GamepadButton
-#include <memory>     // Para std::shared_ptr
+#include <SDL3/SDL.h> // Para SDL_GamepadButton, SDL_Event, SDL_GamepadButtonEvent
 #include <stddef.h>   // Para size_t
-#include <string>     // Para std::string
-#include <vector>     // Para std::vector
+#include <memory>     // Para shared_ptr
+#include <string>     // Para basic_string, string
+#include <vector>     // Para vector
 
 // Declaraciones adelantadas
 class Input;
diff --git a/source/director.cpp b/source/director.cpp
index 3e41cca..eef6b7a 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -1,42 +1,39 @@
 // IWYU pragma: no_include <bits/chrono.h>
 #include "director.h"
-#include <SDL3/SDL.h>				// Para SDL_AudioFormat
-#include <SDL3/SDL.h>				// Para SDL_GetError
-#include <SDL3/SDL.h>				// Para SDL_GamepadButton
-#include <SDL3/SDL.h>				// Para SDL_Init, SDL_Quit, SDL_INIT_AUDIO
-#include <SDL3/SDL.h>				// Para SDL_Log, SDL_LogCategory, SDL_LogE...
-#include <SDL3/SDL.h>				// Para SDL_Scancode
-#include <errno.h>					// Para errno, EEXIST, EACCES, ENAMETOOLONG
-#include <stdio.h>					// Para printf, perror
-#include <sys/stat.h>				// Para mkdir, stat, S_IRWXU
-#include <unistd.h>					// Para getuid
-#include <algorithm>				// Para min
-#include <cstdlib>					// Para exit, EXIT_FAILURE, size_t, srand
-#include <ctime>					// Para time
-#include <memory>					// Para make_unique, unique_ptr
-#include <stdexcept>				// Para runtime_error
-#include <string>					// Para operator+, allocator, char_traits
-#include <vector>					// Para vector
+
+#include <SDL3/SDL.h> // Para SDL_Scancode, SDL_GamepadButton
+#include <errno.h>	  // Para errno, EEXIST, EACCES, ENAMETOOLONG
+#include <stdio.h>	  // Para printf, perror
+#include <sys/stat.h> // Para mkdir, stat, S_IRWXU
+#include <unistd.h>	  // Para getuid
+#include <algorithm>  // Para min
+#include <cstdlib>	  // Para exit, EXIT_FAILURE, size_t, srand
+#include <ctime>	  // Para time
+#include <memory>	  // Para make_unique, unique_ptr
+#include <stdexcept>  // Para runtime_error
+#include <string>	  // Para operator+, basic_string, allocator
+#include <vector>	  // Para vector
+
 #include "asset.h"					// Para Asset, AssetType
 #include "audio.h"					// Para Audio
 #include "input.h"					// Para Input, InputAction
-#include "lang.h"					// Para Code, loadFromFile
+#include "lang.h"					// Para setLanguage
 #include "manage_hiscore_table.h"	// Para ManageHiScoreTable
 #include "notifier.h"				// Para Notifier
-#include "options.h"				// Para GamepadOptions, Options, options
+#include "options.h"				// Para GamepadOptions, controllers, loa...
 #include "param.h"					// Para loadParamsFromFile
 #include "resource.h"				// Para Resource
 #include "screen.h"					// Para Screen
 #include "section.h"				// Para Name, Options, name, options
 #include "sections/credits.h"		// Para Credits
-#include "sections/game.h"			// Para Game, GAME_MODE_DEMO_OFF, GAME_MOD...
+#include "sections/game.h"			// Para Game, GAME_MODE_DEMO_OFF, GAME_M...
 #include "sections/hiscore_table.h" // Para HiScoreTable
 #include "sections/instructions.h"	// Para Instructions
 #include "sections/intro.h"			// Para Intro
 #include "sections/logo.h"			// Para Logo
 #include "sections/title.h"			// Para Title
 #include "ui/service_menu.h"		// Para ServiceMenu
-#include "utils.h"					// Para Overrides, overrides
+#include "utils.h"					// Para Overrides, overrides, getPath
 
 #ifndef _WIN32
 #include <pwd.h> // Para getpwuid, passwd
diff --git a/source/director.h b/source/director.h
index 6b9f6c0..bc779f9 100644
--- a/source/director.h
+++ b/source/director.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string> // Para manejar cadenas de texto
+
 namespace Lang
 {
 	enum class Code : int;
diff --git a/source/enter_name.cpp b/source/enter_name.cpp
index 660b684..1e58d67 100644
--- a/source/enter_name.cpp
+++ b/source/enter_name.cpp
@@ -1,6 +1,10 @@
 #include "enter_name.h"
-#include <stddef.h> // Para size_t
-#include "utils.h"  // Para trim
+
+#include <stddef.h>    // Para size_t
+#include <stdlib.h>    // Para rand
+#include <string_view> // Para basic_string_view, string_view
+
+#include "utils.h" // Para trim
 
 // Constructor
 EnterName::EnterName()
diff --git a/source/enter_name.h b/source/enter_name.h
index 5e329c4..cec761d 100644
--- a/source/enter_name.h
+++ b/source/enter_name.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <array>   // Para std::array
-#include <string>  // Para std::string
-#include "utils.h" // Archivo de utilidades
+#include <stddef.h> // Para size_t
+#include <array>    // Para array
+#include <string>   // Para string, basic_string
+
+#include "utils.h" // Para trim
 
 // Tamaño máximo del nombre
 constexpr size_t NAME_SIZE = 5;
diff --git a/source/explosions.cpp b/source/explosions.cpp
index 5d54a4a..b29869a 100644
--- a/source/explosions.cpp
+++ b/source/explosions.cpp
@@ -1,5 +1,7 @@
 #include "explosions.h"
+
 #include "animated_sprite.h" // Para AnimatedSprite
+
 class Texture;               // lines 4-4
 
 // Actualiza la lógica de la clase
diff --git a/source/explosions.h b/source/explosions.h
index 75181d1..817c6c8 100644
--- a/source/explosions.h
+++ b/source/explosions.h
@@ -3,6 +3,7 @@
 #include <memory>            // Para unique_ptr, shared_ptr
 #include <string>            // Para string
 #include <vector>            // Para vector
+
 #include "animated_sprite.h" // Para AnimatedSprite
 
 class Texture;
diff --git a/source/external/gif.cpp b/source/external/gif.cpp
index 221b193..c2f32ba 100644
--- a/source/external/gif.cpp
+++ b/source/external/gif.cpp
@@ -1,4 +1,5 @@
 #include "gif.h"
+
 #include <SDL3/SDL.h> // Para SDL_LogError, SDL_LogCategory, SDL_LogInfo
 #include <cstring>    // Para memcpy, size_t
 #include <stdexcept>  // Para runtime_error
diff --git a/source/external/jail_audio.cpp b/source/external/jail_audio.cpp
index b35ab45..1314003 100644
--- a/source/external/jail_audio.cpp
+++ b/source/external/jail_audio.cpp
@@ -1,8 +1,13 @@
 #ifndef JA_USESDLMIXER
 #include "jail_audio.h"
-#include "stb_vorbis.h"
-#include <SDL3/SDL.h>
-#include <stdio.h>
+
+#include <SDL3/SDL.h> // Para SDL_AudioFormat, SDL_BindAudioStream, SDL_Se...
+#include <stdint.h>   // Para uint32_t, uint8_t
+#include <stdio.h>    // Para NULL, fseek, printf, fclose, fopen, fread
+#include <stdlib.h>   // Para free, malloc
+#include <string.h>   // Para strcpy, strlen
+
+#include "stb_vorbis.h" // Para stb_vorbis_decode_memory
 
 #define JA_MAX_SIMULTANEOUS_CHANNELS 20
 #define JA_MAX_GROUPS 2
diff --git a/source/external/jail_shader.cpp b/source/external/jail_shader.cpp
index 41527e8..bc502d6 100644
--- a/source/external/jail_shader.cpp
+++ b/source/external/jail_shader.cpp
@@ -1,20 +1,22 @@
 #include "jail_shader.h"
-#include <SDL3/SDL.h> // Para SDL_LogCategory, SDL_LogError, SDL_LogWarn
-#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_Point
+
+#include <SDL3/SDL.h> // Para SDL_GL_GetProcAddress, SDL_LogError
+#include <stdint.h>   // Para uintptr_t
 #include <cstring>    // Para strncmp
 #include <stdexcept>  // Para runtime_error
 #include <vector>     // Para vector
 
 #ifdef __APPLE__
+#include <OpenGL/OpenGL.h> // Para OpenGL en macOS
+
 #include "CoreFoundation/CoreFoundation.h" // Para Core Foundation en macOS
-#include <OpenGL/OpenGL.h>                 // Para OpenGL en macOS
 #if ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
 #include <OpenGL/gl3.h>      // Para OpenGL 3 en macOS
 #else                        // NO ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
 #include <OpenGL/gl.h>       // Para OpenGL (compatibilidad) en macOS
 #endif                       // ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
 #else                        // SI NO ES __APPLE__
-#include <SDL3/SDL_opengl.h> // Para GLuint, glTexCoord2f, glVertex2f, GLfloat
+#include <SDL3/SDL_opengl.h> // Para GLuint, GLint, glTexCoord2f, glVertex2f
 #endif                       // __APPLE__
 
 namespace shader
diff --git a/source/external/jail_shader.h b/source/external/jail_shader.h
index e725cb1..6247dcb 100644
--- a/source/external/jail_shader.h
+++ b/source/external/jail_shader.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_Texture
-#include <SDL3/SDL.h> // Para SDL_Window
-#include <string>
+#include <SDL3/SDL.h> // Para SDL_Texture, SDL_Window
+#include <string>     // Para basic_string, string
 
 namespace shader
 {
diff --git a/source/external/json.hpp b/source/external/json.hpp
index 82d69f7..d4a35b4 100644
--- a/source/external/json.hpp
+++ b/source/external/json.hpp
@@ -6059,7 +6059,7 @@ inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
     j = { p.first, p.second };
 }
 
-// for https://github.com/nlohmann/json/pull/1134
+// Para https://github.com/nlohmann/json/pull/1134
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
 inline void to_json(BasicJsonType& j, const T& b)
@@ -6624,7 +6624,7 @@ class iterator_input_adapter
         return char_traits<char_type>::eof();
     }
 
-    // for general iterators, we cannot really do something better than falling back to processing the range one-by-one
+    // Para general iterators, we cannot really do something better than falling back to processing the range one-by-one
     template<class T>
     std::size_t get_elements(T* dest, std::size_t count = 1)
     {
@@ -14558,7 +14558,7 @@ class json_pointer
     };
 
   public:
-    // for backwards compatibility accept BasicJsonType
+    // Para backwards compatibility accept BasicJsonType
     using string_t = typename string_t_helper<RefStringType>::type;
 
     /// @brief create JSON pointer
@@ -18087,7 +18087,7 @@ inline cached_power get_cached_power_for_binary_exponent(int e)
 
     // This computation gives exactly the same results for k as
     //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
-    // for |e| <= 1500, but doesn't require floating-point operations.
+    // Para |e| <= 1500, but doesn't require floating-point operations.
     // NB: log_10(2) ~= 78913 / 2^18
     JSON_ASSERT(e >= -1500);
     JSON_ASSERT(e <=  1500);
@@ -19727,7 +19727,7 @@ NLOHMANN_JSON_NAMESPACE_END
 #include <initializer_list> // initializer_list
 #include <iterator> // input_iterator_tag, iterator_traits
 #include <memory> // allocator
-#include <stdexcept> // for out_of_range
+#include <stdexcept> // Para out_of_range
 #include <type_traits> // enable_if, is_convertible
 #include <utility> // pair
 #include <vector> // vector
@@ -19740,7 +19740,7 @@ NLOHMANN_JSON_NAMESPACE_END
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /// ordered_map: a minimal map-like container that preserves insertion order
-/// for use within nlohmann::basic_json<ordered_map>
+/// Para use within nlohmann::basic_json<ordered_map>
 template <class Key, class T, class IgnoredLess = std::less<Key>,
           class Allocator = std::allocator<std::pair<const Key, T>>>
               struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
diff --git a/source/fade.cpp b/source/fade.cpp
index 1aca11c..3ce0759 100644
--- a/source/fade.cpp
+++ b/source/fade.cpp
@@ -1,10 +1,12 @@
 #include "fade.h"
-#include <SDL3/SDL.h> // Para SDL_BLENDMODE_BLEND, SDL_BLENDMODE_NONE
-#include <SDL3/SDL.h> // Para SDL_PIXELFORMAT_RGBA8888
-#include <stdlib.h>	  // Para rand
+
+#include <SDL3/SDL.h> // Para SDL_SetRenderTarget, SDL_FRect, SDL_GetRenderT...
+#include <stdlib.h>	  // Para rand, size_t
 #include <algorithm>  // Para min, max
-#include "param.h"	  // Para Param, param, ParamGame, ParamFade
-#include "screen.h"	  // Para Screen
+
+#include "param.h"	// Para Param, param, ParamGame, ParamFade
+#include "screen.h" // Para Screen
+#include "utils.h"	// Para Color
 
 // Constructor
 Fade::Fade()
diff --git a/source/fade.h b/source/fade.h
index d1dd40d..dcaffeb 100644
--- a/source/fade.h
+++ b/source/fade.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <SDL3/SDL.h>
-#include <SDL3/SDL.h>
-#include <SDL3/SDL.h>
-#include <vector>
-#include "utils.h"
+#include <SDL3/SDL.h> // Para Uint8, SDL_FRect, SDL_Renderer, SDL_Texture, Uint16
+#include <vector>	  // Para vector
+
+struct Color;
 
 // Tipos de fundido
 enum class FadeType : Uint8
diff --git a/source/game_logo.cpp b/source/game_logo.cpp
index 3b370bd..39bff0f 100644
--- a/source/game_logo.cpp
+++ b/source/game_logo.cpp
@@ -1,8 +1,11 @@
 #include "game_logo.h"
-#include <SDL3/SDL.h>        // Para SDL_FlipMode
-#include <algorithm>         // Para max
+
+#include <SDL3/SDL.h> // Para SDL_SetTextureScaleMode, SDL_FlipMode
+#include <algorithm>  // Para max
+#include <string>     // Para basic_string
+
 #include "animated_sprite.h" // Para AnimatedSprite
-#include "audio.h"           // Para JA_PlaySound
+#include "audio.h"           // Para Audio
 #include "param.h"           // Para Param, param, ParamGame, ParamTitle
 #include "resource.h"        // Para Resource
 #include "screen.h"          // Para Screen
diff --git a/source/game_logo.h b/source/game_logo.h
index d28ccf9..e225d9e 100644
--- a/source/game_logo.h
+++ b/source/game_logo.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>            // Para unique_ptr, shared_ptr
+
 #include "animated_sprite.h" // Para AnimatedSprite
 #include "smart_sprite.h"    // Para SmartSprite
 #include "sprite.h"          // Para Sprite
diff --git a/source/global_events.cpp b/source/global_events.cpp
index 6c52445..fc1739b 100644
--- a/source/global_events.cpp
+++ b/source/global_events.cpp
@@ -1,8 +1,10 @@
 #include "global_events.h"
+
 #include <SDL3/SDL.h> // Para SDL_LogInfo, SDL_LogCategory
+
 #include "mouse.h"    // Para handleEvent
-#include "section.h"  // Para Name, Options, name, options
 #include "screen.h"
+#include "section.h"  // Para Name, Options, name, options
 
 namespace GlobalEvents
 {
diff --git a/source/global_inputs.cpp b/source/global_inputs.cpp
index b0add5e..d1ce276 100644
--- a/source/global_inputs.cpp
+++ b/source/global_inputs.cpp
@@ -1,14 +1,14 @@
 #include "global_inputs.h"
-#include <SDL3/SDL.h>        // Para SDL_RendererLogicalPresentation, SDL_Se...
-#include <string>            // Para operator+, allocator, char_traits, string
-#include <vector>            // Para vector
+
+#include <string> // Para basic_string, operator+, allocator, cha...
+#include <vector> // Para vector
+
 #include "asset.h"           // Para Asset
-#include "input.h"           // Para Input, InputAction, InputDeviceToUse
-#include "audio.h"           // Para JA_SetMusicVolume, JA_SetSoundVolume
+#include "audio.h"           // Para Audio
+#include "input.h"           // Para Input, INPUT_DO_NOT_ALLOW_REPEAT, Input...
 #include "lang.h"            // Para getText, Code, getNextLangCode, loadFro...
 #include "notifier.h"        // Para Notifier
-#include "options.h"         // Para Options, options, VideoOptions, GameOpt...
-#include "param.h"           // Para Param, ParamGame, param
+#include "options.h"         // Para SettingsOptions, settings, VideoOptions
 #include "screen.h"          // Para Screen
 #include "section.h"         // Para Name, name, Options, options, AttractMode
 #include "ui/service_menu.h" // Para ServiceMenu
diff --git a/source/input.cpp b/source/input.cpp
index dd7f7c4..7b8cd14 100644
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -1,11 +1,10 @@
 #include "input.h"
-#include <SDL3/SDL.h>	 // Para SDL_GetError
-#include <SDL3/SDL.h>	 // Para SDL_INIT_GAMEPAD, SDL_InitSubSystem
-#include <SDL3/SDL.h>	 // Para SDL_GetKeyboardState
-#include <SDL3/SDL.h>	 // Para SDL_LogInfo, SDL_LogCategory, SDL_Log...
+
+#include <SDL3/SDL.h>	 // Para SDL_LogInfo, SDL_LogCategory, SDL_GetGamepa...
+#include <stddef.h>		 // Para size_t
 #include <algorithm>	 // Para find
 #include <iterator>		 // Para distance
-#include <unordered_map> // Para unordered_map, operator==, _Node_cons...
+#include <unordered_map> // Para unordered_map, _Node_const_iterator, operat...
 #include <utility>		 // Para pair
 
 // Singleton
diff --git a/source/input.h b/source/input.h
index 4ba0c19..a080dc2 100644
--- a/source/input.h
+++ b/source/input.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_GamepadButton, SDL_Gamepad
-#include <SDL3/SDL.h> // Para SDL_Joystick, SDL_JoystickID
-#include <SDL3/SDL.h> // Para SDL_Scancode
-#include <SDL3/SDL.h> // Para Uint8
-#include <string>	  // Para string
+#include <SDL3/SDL.h> // Para SDL_GamepadButton, Uint8, SDL_Gamepad, SDL_Joystick, SDL_JoystickID, SDL_Scancode, Sint16
+#include <string>	  // Para basic_string, string
 #include <vector>	  // Para vector
 
 /*
diff --git a/source/item.cpp b/source/item.cpp
index 7d342c6..3ed3eae 100644
--- a/source/item.cpp
+++ b/source/item.cpp
@@ -1,8 +1,11 @@
 #include "item.h"
+
 #include <stdlib.h>			 // Para rand
 #include <algorithm>		 // Para clamp
+
 #include "animated_sprite.h" // Para AnimatedSprite
 #include "param.h"			 // Para Param, ParamGame, param
+
 class Texture;				 // lines 6-6
 
 Item::Item(ItemType type, float x, float y, SDL_FRect &play_area, std::shared_ptr<Texture> texture, const std::vector<std::string> &animation)
diff --git a/source/item.h b/source/item.h
index 2fb902f..6343e64 100644
--- a/source/item.h
+++ b/source/item.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h>        // Para SDL_FRect
-#include <SDL3/SDL.h>        // Para Uint16
-#include <memory>            // Para shared_ptr, unique_ptr
-#include <string>            // Para string
-#include <vector>            // Para vector
+#include <SDL3/SDL.h> // Para SDL_FRect, Uint16
+#include <memory>     // Para shared_ptr, unique_ptr
+#include <string>     // Para string
+#include <vector>     // Para vector
+
 #include "animated_sprite.h" // Para AnimatedSprite
 #include "utils.h"           // Para Circle
 
diff --git a/source/lang.cpp b/source/lang.cpp
index e1964d9..b12f653 100644
--- a/source/lang.cpp
+++ b/source/lang.cpp
@@ -1,9 +1,15 @@
 #include "lang.h"
-#include <fstream>
-#include <unordered_map>
-#include "external/json.hpp"
-#include "options.h"
-#include "asset.h"
+
+#include <stddef.h>      // Para size_t
+#include <exception>     // Para exception
+#include <fstream>       // Para basic_ifstream, basic_istream, ifstream
+#include <unordered_map> // Para unordered_map, _Node_iterator, operator==
+#include <utility>       // Para pair
+#include <vector>        // Para vector
+
+#include "asset.h"           // Para Asset
+#include "external/json.hpp" // Para basic_json, iteration_proxy_value, oper...
+#include "options.h"         // Para Difficulty, DifficultyCode, SettingsOpt...
 
 using json = nlohmann::json;
 
diff --git a/source/lang.h b/source/lang.h
index cb84a5a..e594f09 100644
--- a/source/lang.h
+++ b/source/lang.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <string>
-#include <vector>
+#include <string> // Para string, basic_string
 
 namespace Lang
 {
diff --git a/source/main.cpp b/source/main.cpp
index 2b727fa..c4969e5 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -8,6 +8,7 @@ Actualizando a la versión "Arcade Edition" en 08/05/2024
 */
 
 #include <memory>     // Para make_unique, unique_ptr
+
 #include "director.h" // Para Director
 
 int main(int argc, char *argv[])
diff --git a/source/manage_hiscore_table.cpp b/source/manage_hiscore_table.cpp
index 6466436..179d2e4 100644
--- a/source/manage_hiscore_table.cpp
+++ b/source/manage_hiscore_table.cpp
@@ -1,10 +1,10 @@
 #include "manage_hiscore_table.h"
-#include <SDL3/SDL.h> // Para SDL_GetError
-#include <SDL3/SDL.h> // Para SDL_ReadIO, SDL_WriteIO, SDL_CloseIO
-#include <SDL3/SDL.h> // Para SDL_LogCategory, SDL_LogError, SDL_Lo...
+
+#include <SDL3/SDL.h> // Para SDL_ReadIO, SDL_WriteIO, SDL_CloseIO, SDL_GetE...
 #include <algorithm>  // Para find_if, sort
 #include <iterator>   // Para distance
-#include "utils.h"    // Para getFileName
+
+#include "utils.h" // Para getFileName
 
 // Resetea la tabla a los valores por defecto
 void ManageHiScoreTable::clear()
diff --git a/source/mouse.cpp b/source/mouse.cpp
index 3f5386a..0ada5bc 100644
--- a/source/mouse.cpp
+++ b/source/mouse.cpp
@@ -1,6 +1,6 @@
 #include "mouse.h"
-#include <SDL3/SDL.h> // Para SDL_ShowCursor
-#include <SDL3/SDL.h> // Para SDL_GetTicks
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, Uint32, SDL_HideCursor, SDL_Show...
 
 namespace Mouse
 {
diff --git a/source/mouse.h b/source/mouse.h
index cbb5b5e..9d31394 100644
--- a/source/mouse.h
+++ b/source/mouse.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_Event
-#include <SDL3/SDL.h> // Para Uint32
+#include <SDL3/SDL.h> // Para Uint32, SDL_Event
 
 namespace Mouse
 {
diff --git a/source/moving_sprite.cpp b/source/moving_sprite.cpp
index d4980fd..0e1917c 100644
--- a/source/moving_sprite.cpp
+++ b/source/moving_sprite.cpp
@@ -1,4 +1,5 @@
 #include "moving_sprite.h"
+
 #include "texture.h" // Para Texture
 
 // Constructor
diff --git a/source/moving_sprite.h b/source/moving_sprite.h
index 7cebe69..255b42c 100644
--- a/source/moving_sprite.h
+++ b/source/moving_sprite.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_FlipMode
-#include <algorithm>  // Para std::max
+#include <SDL3/SDL.h> // Para SDL_FlipMode, SDL_FPoint, SDL_FRect
+#include <algorithm>  // Para max
 #include <memory>     // Para shared_ptr
-#include "sprite.h"   // Para Sprite
+
+#include "sprite.h" // Para Sprite
 
 class Texture;
 
diff --git a/source/notifier.cpp b/source/notifier.cpp
index 6ca6932..14d440e 100644
--- a/source/notifier.cpp
+++ b/source/notifier.cpp
@@ -1,16 +1,16 @@
 #include "notifier.h"
-#include <SDL3/SDL.h> // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h> // Para SDL_PIXELFORMAT_RGBA8888
-#include <string>     // Para string
-#include <algorithm>
-#include <vector>
-#include "audio.h"   // Para JA_DeleteSound, JA_LoadSound, JA_Pla...
-#include "param.h"   // Para Param, param, ParamNotification, Par...
+
+#include <SDL3/SDL.h> // Para SDL_RenderFillRect, SDL_FRect, SDL_RenderClear
+#include <algorithm>  // Para remove_if
+#include <string>     // Para basic_string, string
+#include <vector>     // Para vector
+
+#include "audio.h"   // Para Audio
+#include "param.h"   // Para Param, param, ParamNotification, ParamGame
 #include "screen.h"  // Para Screen
 #include "sprite.h"  // Para Sprite
 #include "text.h"    // Para Text
 #include "texture.h" // Para Texture
-#include "resource.h"
 
 // Singleton
 Notifier *Notifier::instance_ = nullptr;
diff --git a/source/notifier.h b/source/notifier.h
index 0cf45e1..b4d97e2 100644
--- a/source/notifier.h
+++ b/source/notifier.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Renderer
+#include <SDL3/SDL.h> // Para SDL_FRect, SDL_Renderer
 #include <memory>     // Para shared_ptr
-#include <string>     // Para string
+#include <string>     // Para basic_string, string
 #include <vector>     // Para vector
-#include "utils.h"    // Para Color
+
+#include "utils.h" // Para stringInVector, Color
 
 class Sprite;
 class Text;
diff --git a/source/options.cpp b/source/options.cpp
index fcf3d75..7eeaf72 100644
--- a/source/options.cpp
+++ b/source/options.cpp
@@ -1,13 +1,15 @@
 #include "options.h"
+
 #include <SDL3/SDL.h> // Para SDL_LogCategory, SDL_LogInfo, SDL_LogError
 #include <algorithm>  // Para clamp
 #include <fstream>	  // Para basic_ostream, operator<<, basic_ostream::...
 #include <utility>	  // Para swap
 #include <vector>	  // Para vector
+
+#include "asset.h"
 #include "input.h"	  // Para InputDeviceToUse
 #include "lang.h"	  // Para Code
 #include "utils.h"	  // Para boolToString, stringToBool, getFileName
-#include "asset.h"
 
 namespace Options
 {
diff --git a/source/options.h b/source/options.h
index 7288803..6343e05 100644
--- a/source/options.h
+++ b/source/options.h
@@ -1,21 +1,15 @@
 #pragma once
 
-#include <SDL3/SDL.h>			  // Para SDL_GamepadButton
-#include <SDL3/SDL.h>			  // Para SDL_ScaleMode
-#include <string>				  // Para std::string
-#include <vector>				  // Para std::vector
-#include "input.h"				  // Para InputAction, InputDeviceToUse
+#include <SDL3/SDL.h> // Para SDL_GamepadButton, SDL_ScaleMode
+#include <string>	  // Para string, basic_string
+#include <vector>	  // Para vector
+
+#include "input.h"				  // Para InputAction, InputDevice
+#include "lang.h"				  // Para Code
 #include "manage_hiscore_table.h" // Para HiScoreEntry
-#include "asset.h"
-#include "lang.h"
 
 static constexpr int INVALID_INDEX = -1;
 
-namespace Lang
-{
-	enum class Code : int;
-}
-
 namespace Options
 {
 	// --- Dificultad del juego ---
diff --git a/source/param.cpp b/source/param.cpp
index 837d715..04ce22b 100644
--- a/source/param.cpp
+++ b/source/param.cpp
@@ -1,9 +1,11 @@
 #include "param.h"
+
 #include <SDL3/SDL.h> // Para SDL_LogCategory, SDL_LogError, SDL_LogInfo
 #include <fstream>	  // Para basic_istream, basic_ifstream, ifstream
 #include <sstream>	  // Para basic_istringstream
 #include <stdexcept>  // Para runtime_error
 #include <string>	  // Para operator==, stoi, char_traits, string, ope...
+
 #include "utils.h"	  // Para Zone, Color, NotifyPosition, getFileName
 
 Param param;
diff --git a/source/param.h b/source/param.h
index 74ecd7e..00c505b 100644
--- a/source/param.h
+++ b/source/param.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para Uint32
-#include <string>     // Para std::string
-#include <vector>     // Para std::vector
-#include "utils.h"    // Para Color, Zone, NotifyPosition
+#include <SDL3/SDL.h> // Para Uint32, SDL_FRect
+#include <array>      // Para array
+#include <string>     // Para basic_string, string
+
+#include "utils.h" // Para Color, NotifyPosition (ptr only), Zone
 
 // --- Parámetros del juego ---
 struct ParamGame
diff --git a/source/path_sprite.cpp b/source/path_sprite.cpp
index 93b8d7b..0e7ffaf 100644
--- a/source/path_sprite.cpp
+++ b/source/path_sprite.cpp
@@ -1,5 +1,7 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include "path_sprite.h"
+
+#include <cmath>	  // Para abs
 #include <functional> // Para function
 #include <utility>	  // Para move
 
diff --git a/source/path_sprite.h b/source/path_sprite.h
index 05fe000..e5b090e 100644
--- a/source/path_sprite.h
+++ b/source/path_sprite.h
@@ -4,6 +4,7 @@
 #include <functional> // Para std::function
 #include <memory>	  // Para shared_ptr
 #include <vector>	  // Para vector
+
 #include "sprite.h"	  // Para Sprite
 
 class Texture;
diff --git a/source/player.cpp b/source/player.cpp
index c19c683..4cebf15 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -1,18 +1,18 @@
 #include "player.h"
-#include <SDL3/SDL.h>			  // Para SDL_FlipMode
-#include <SDL3/SDL.h>			  // Para SDL_GetTicks
-#include <stdlib.h>				  // Para rand
-#include <algorithm>			  // Para clamp, max, min
-#include <array>				  // Para array
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_FlipMode, SDL_FRect
+#include <stdlib.h>	  // Para rand
+#include <algorithm>  // Para clamp, max, min
+
 #include "animated_sprite.h"	  // Para AnimatedSprite
+#include "asset.h"				  // Para Asset
+#include "audio.h"				  // Para Audio
 #include "input.h"				  // Para InputAction
-#include "audio.h"				  // Para JA_PlaySound
+#include "manage_hiscore_table.h" // Para ManageHiScoreTable, HiScoreEntry
 #include "param.h"				  // Para Param, ParamGame, param
-#include "resource.h"			  // Para Resource
-#include "scoreboard.h"			  // Para Scoreboard, ScoreboardMode
+#include "scoreboard.h"			  // Para ScoreboardMode, Scoreboard
 #include "stage.h"				  // Para power_can_be_added
 #include "texture.h"			  // Para Texture
-#include "manage_hiscore_table.h" // Para ManageHiScoreTable, HiScoreEntry
 
 // Constructor
 Player::Player(int id, float x, int y, bool demo, SDL_FRect &play_area, std::vector<std::shared_ptr<Texture>> texture, const std::vector<std::vector<std::string>> &animations)
diff --git a/source/player.h b/source/player.h
index 96b709a..8feded1 100644
--- a/source/player.h
+++ b/source/player.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <SDL3/SDL.h>        // Para SDL_FRect
-#include <SDL3/SDL.h>        // Para Uint32
-#include <memory>            // Para unique_ptr, shared_ptr
-#include <string>            // Para string
-#include <vector>            // Para vector
-#include "animated_sprite.h" // Para AnimatedSprite
-#include "enter_name.h"      // Para EnterName
-#include "options.h"         // Para Options, OptionsGame, options
-#include "utils.h"           // Para Circle
+#include <SDL3/SDL.h> // Para Uint32, SDL_FRect
+#include <memory>     // Para unique_ptr, shared_ptr
+#include <string>     // Para basic_string, string
+#include <vector>     // Para vector
+
+#include "animated_sprite.h"      // Para AnimatedSprite
+#include "enter_name.h"           // Para EnterName
+#include "manage_hiscore_table.h" // Para HiScoreEntry
+#include "options.h"              // Para SettingsOptions, settings
+#include "utils.h"                // Para Circle
 
 class Texture;
 enum class InputAction : int;
diff --git a/source/resource.cpp b/source/resource.cpp
index 68a333d..388dd4b 100644
--- a/source/resource.cpp
+++ b/source/resource.cpp
@@ -1,15 +1,18 @@
 #include "resource.h"
-#include <SDL3/SDL.h> // Para SDL_LogInfo, SDL_LogCategory, SDL_LogError
-#include <SDL3/SDL.h>
-#include <algorithm> // Para find_if
-#include <array>
-#include <stdexcept>             // Para runtime_error
+
+#include <SDL3/SDL.h> // Para SDL_LogInfo, SDL_LogCategory, SDL_L...
+#include <stdlib.h>   // Para exit
+#include <algorithm>  // Para find_if
+#include <array>      // Para array
+#include <stdexcept>  // Para runtime_error
+
 #include "asset.h"               // Para Asset, AssetType
-#include "external/jail_audio.h" // Para JA_DeleteMusic, JA_DeleteSound, JA_LoadMusic
+#include "external/jail_audio.h" // Para JA_DeleteMusic, JA_DeleteSound, JA_...
 #include "lang.h"                // Para getText
+#include "param.h"               // Para Param, param, ParamResource, ParamGame
 #include "screen.h"              // Para Screen
-#include "text.h"                // Para Text, loadTextFile
-#include "param.h"
+#include "text.h"                // Para Text, loadTextFile, TextFile (ptr o...
+
 struct JA_Music_t; // lines 11-11
 struct JA_Sound_t; // lines 12-12
 
diff --git a/source/resource.h b/source/resource.h
index 596ec9f..dce9ef1 100644
--- a/source/resource.h
+++ b/source/resource.h
@@ -1,13 +1,18 @@
 #pragma once
 
-#include <memory>
-#include <string>
-#include <vector>
-#include "animated_sprite.h"
-#include "text.h"
-#include "texture.h"
-#include "utils.h"
-#include "external/jail_audio.h"
+#include <SDL3/SDL.h> // Para SDL_FRect
+#include <stddef.h>   // Para size_t
+#include <memory>     // Para shared_ptr
+#include <string>     // Para basic_string, string
+#include <vector>     // Para vector
+
+#include "animated_sprite.h" // Para AnimationsFileBuffer
+#include "text.h"            // Para Text, TextFile
+#include "texture.h"         // Para Texture
+#include "utils.h"           // Para DemoData
+
+struct JA_Music_t;
+struct JA_Sound_t;
 
 // --- Clase Resource: gestiona todos los recursos del juego (singleton) ---
 class Resource
diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp
index 3c8b901..a0624ce 100644
--- a/source/scoreboard.cpp
+++ b/source/scoreboard.cpp
@@ -1,17 +1,18 @@
 #include "scoreboard.h"
-#include <SDL3/SDL.h>	// Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>	// Para SDL_PIXELFORMAT_RGBA8888
-#include <SDL3/SDL.h>	// Para SDL_GetTicks
-#include <math.h>		// Para roundf
-#include <iomanip>		// Para operator<<, setfill, setw
-#include <sstream>		// Para basic_ostream, basic_ostringstream
-#include "enter_name.h" // Para MAX_NAME_LENGHT
+
+#include <SDL3/SDL.h> // Para SDL_DestroyTexture, SDL_SetRenderDrawColor
+#include <math.h>	  // Para roundf
+#include <iomanip>	  // Para operator<<, setfill, setw
+#include <sstream>	  // Para basic_ostringstream, basic_ostream, basic_os...
+
+#include "enter_name.h" // Para NAME_SIZE
 #include "lang.h"		// Para getText
+#include "param.h"		// Para Param, ParamScoreboard, param
 #include "resource.h"	// Para Resource
 #include "screen.h"		// Para Screen
 #include "sprite.h"		// Para Sprite
 #include "text.h"		// Para Text, TEXT_CENTER, TEXT_COLOR
-#include "param.h"
+#include "texture.h"	// Para Texture
 
 // [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
 Scoreboard *Scoreboard::scoreboard_ = nullptr;
diff --git a/source/scoreboard.h b/source/scoreboard.h
index f7d5cd5..d4ece15 100644
--- a/source/scoreboard.h
+++ b/source/scoreboard.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Texture, SDL_Renderer
-#include <SDL3/SDL.h> // Para Uint32
-#include <SDL3/SDL.h> // Para SDL_GetTicks
+#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_GetTicks, SDL_FRect, SDL_Texture, SDL_Renderer, Uint64
 #include <stddef.h>	  // Para size_t
-#include <memory>	  // Para unique_ptr, shared_ptr
-#include <string>	  // Para string
+#include <memory>	  // Para shared_ptr, unique_ptr
+#include <string>	  // Para basic_string, string
 #include <vector>	  // Para vector
-#include "utils.h"	  // Para Color
+
+#include "utils.h" // Para Color
 
 class Sprite;
 class Text;
diff --git a/source/screen.cpp b/source/screen.cpp
index fe074bf..69c2780 100644
--- a/source/screen.cpp
+++ b/source/screen.cpp
@@ -1,25 +1,21 @@
 #include "screen.h"
-#include <SDL3/SDL.h>             // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>             // Para SDL_GetError
-#include <SDL3/SDL.h>             // Para SDL_SetHint, SDL_HINT_RENDER_DRIVER
-#include <SDL3/SDL.h>             // Para SDL_Init, SDL_INIT_VIDEO
-#include <SDL3/SDL.h>             // Para SDL_LogCategory, SDL_LogError, SDL_L...
-#include <SDL3/SDL.h>             // Para SDL_PixelFormat
-#include <SDL3/SDL.h>             // Para SDL_ScaleMode
-#include <SDL3/SDL.h>             // Para SDL_GetTicks
-#include <algorithm>              // Para min, max
-#include <fstream>                // Para basic_ifstream, ifstream
-#include <iterator>               // Para istreambuf_iterator, operator==
-#include <memory>                 // Para __shared_ptr_access, shared_ptr
-#include <string>                 // Para allocator, char_traits, operator+
+
+#include <SDL3/SDL.h> // Para SDL_SetRenderTarget, SDL_LogCategory
+#include <algorithm>  // Para min, max
+#include <fstream>    // Para basic_ifstream, ifstream
+#include <iterator>   // Para istreambuf_iterator, operator==
+#include <memory>     // Para allocator, shared_ptr, __shared_pt...
+#include <string>     // Para basic_string, char_traits, operator+
+
 #include "asset.h"                // Para Asset
 #include "external/jail_shader.h" // Para init, render
 #include "mouse.h"                // Para updateCursorVisibility
 #include "notifier.h"             // Para Notifier
-#include "options.h"              // Para Options, options, WindowOptions, Vid...
-#include "resource.h"             // Para Resource
+#include "options.h"              // Para VideoOptions, video, WindowOptions
+#include "param.h"                // Para Param, param, ParamGame, ParamDebug
+#include "text.h"                 // Para Text, TEXT_COLOR, TEXT_STROKE
+#include "texture.h"              // Para Texture
 #include "ui/service_menu.h"      // Para ServiceMenu
-#include "text.h"                 // Para Text
 
 // Singleton
 Screen *Screen::instance_ = nullptr;
diff --git a/source/screen.h b/source/screen.h
index 05ff6d1..afd4831 100644
--- a/source/screen.h
+++ b/source/screen.h
@@ -1,19 +1,15 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Renderer, SDL_SetRenderLogicalPresentation
-#include <SDL3/SDL.h> // Para Uint32
-#include <SDL3/SDL.h> // Para SDL_Window, SDL_HideWindow, SDL_ShowWindow
-#include <SDL3/SDL.h> // Para SDL_LogCategory, SDL_LogError, SDL_Log
-#include <string>	  // Para string
+#include <SDL3/SDL.h> // Para SDL_FRect, SDL_HideWindow, SDL_Renderer, SDL_ShowWindow, Uint32, SDL_Texture, SDL_Window
 #include <memory>	  // Para shared_ptr
-#include "options.h"  // Para Options, VideoOptions, options
-#include "param.h"	  // Para Param, ParamGame, param
-#include "utils.h"	  // Para Color
-#include "text.h"
+#include <string>	  // Para basic_string, string
+
+#include "options.h" // Para VideoOptions, video
+#include "utils.h"	 // Para Color
 
 class Notifier;
 class ServiceMenu;
+class Text;
 
 // Clase Screen: gestiona la ventana, el renderizador y los efectos visuales globales
 class Screen
diff --git a/source/sections/credits.cpp b/source/sections/credits.cpp
index f1b5c1d..e08f6ef 100644
--- a/source/sections/credits.cpp
+++ b/source/sections/credits.cpp
@@ -1,22 +1,22 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include "credits.h"
-#include <SDL3/SDL.h>        // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>        // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>        // Para SDL_PixelFormat
-#include <SDL3/SDL.h>        // Para SDL_GetTicks
-#include <algorithm>         // Para max, min, clamp
-#include <array>             // Para array
-#include <stdexcept>         // Para runtime_error
-#include <string>            // Para basic_string, string
-#include <vector>            // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_RenderFillRect, SDL_RenderTexture
+#include <algorithm>  // Para max, min, clamp
+#include <array>      // Para array
+#include <cmath>      // Para abs
+#include <stdexcept>  // Para runtime_error
+#include <string>     // Para basic_string, string
+#include <vector>     // Para vector
+
+#include "audio.h"           // Para Audio
 #include "balloon_manager.h" // Para BalloonManager
 #include "fade.h"            // Para Fade, FadeType, FadeMode
 #include "global_events.h"   // Para check
-#include "global_inputs.h"   // Para check, update
+#include "global_inputs.h"   // Para check
 #include "input.h"           // Para Input, INPUT_ALLOW_REPEAT
-#include "audio.h"           // Para JA_GetMusicState, JA_SetMusicVolume
 #include "lang.h"            // Para getText
-#include "param.h"           // Para Param, ParamGame, param
+#include "param.h"           // Para Param, param, ParamGame, ParamFade
 #include "player.h"          // Para Player, PlayerState
 #include "resource.h"        // Para Resource
 #include "screen.h"          // Para Screen
@@ -25,9 +25,8 @@
 #include "text.h"            // Para Text, TEXT_CENTER, TEXT_SHADOW
 #include "texture.h"         // Para Texture
 #include "tiled_bg.h"        // Para TiledBG, TiledBGMode
-#include "utils.h"           // Para Color, Zone, shdw_txt_color, no_color
-#include "ui/service_menu.h"
-#include "input.h"
+#include "ui/service_menu.h" // Para ServiceMenu
+#include "utils.h"           // Para Color, Zone, SHADOW_TEXT_COLOR, NO_TEXT...
 
 // Textos
 constexpr const char TEXT_COPYRIGHT[] = "@2020,2025 JailDesigner";
diff --git a/source/sections/credits.h b/source/sections/credits.h
index f1108ed..36682a7 100644
--- a/source/sections/credits.h
+++ b/source/sections/credits.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <SDL3/SDL.h>
-#include <SDL3/SDL.h>
-#include <SDL3/SDL.h>
-#include <memory>
-#include <vector>
+#include <SDL3/SDL.h> // Para SDL_FRect, Uint32, SDL_Texture, Uint64
+#include <memory>     // Para unique_ptr, shared_ptr
+#include <vector>     // Para vector
 
-#include "options.h"
-#include "param.h"
-#include "utils.h"
+#include "options.h" // Para AudioOptions, MusicOptions, audio
+#include "param.h"   // Para Param, ParamGame, param
+#include "utils.h"   // Para Zone, Color
 
 // Declaraciones adelantadas
 class BalloonManager;
diff --git a/source/sections/game.cpp b/source/sections/game.cpp
index 2083ec9..580bb32 100644
--- a/source/sections/game.cpp
+++ b/source/sections/game.cpp
@@ -1,41 +1,38 @@
 #include "game.h"
-#include <SDL3/SDL.h>			  // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>			  // Para SDL_EventType, SDL_Event, SDL_Poll...
-#include <SDL3/SDL.h>			  // Para SDLK_1, SDLK_2, SDLK_3, SDLK_4
-#include <SDL3/SDL.h>			  // Para SDL_PixelFormat
-#include <SDL3/SDL.h>			  // Para SDL_GetTicks
-#include <stdlib.h>				  // Para rand, size_t
-#include <algorithm>			  // Para find_if, clamp, min
-#include <functional>			  // Para function
-#include <iterator>				  // Para distance, size
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderTarget
+#include <stdlib.h>	  // Para rand, size_t
+#include <algorithm>  // Para find_if, clamp, find, min
+#include <functional> // Para function
+#include <iterator>	  // Para distance, size
+
 #include "asset.h"				  // Para Asset
+#include "audio.h"				  // Para Audio
 #include "background.h"			  // Para Background
 #include "balloon.h"			  // Para Balloon, BALLOON_SPEED
 #include "balloon_manager.h"	  // Para BalloonManager
 #include "bullet.h"				  // Para Bullet, BulletType, BulletMoveStatus
 #include "fade.h"				  // Para Fade, FadeType, FadeMode
 #include "global_events.h"		  // Para check
-#include "global_inputs.h"		  // Para check, update
+#include "global_inputs.h"		  // Para check
 #include "input.h"				  // Para InputAction, Input, INPUT_DO_NOT_A...
 #include "item.h"				  // Para Item, ItemType
-#include "audio.h"				  // Para Audio
 #include "lang.h"				  // Para getText
-#include "manage_hiscore_table.h" // Para ManageHiScoreTable, HiScoreEntry
+#include "manage_hiscore_table.h" // Para HiScoreEntry, ManageHiScoreTable
 #include "notifier.h"			  // Para Notifier
-#include "param.h"				  // Para Param, param, ParamGame, ParamFade
+#include "param.h"				  // Para Param, param, ParamGame, ParamScor...
 #include "path_sprite.h"		  // Para Path, PathSprite, createPath, Path...
 #include "player.h"				  // Para Player, PlayerState
 #include "resource.h"			  // Para Resource
 #include "scoreboard.h"			  // Para Scoreboard, ScoreboardMode, SCOREB...
 #include "screen.h"				  // Para Screen
 #include "section.h"			  // Para Name, name, AttractMode, Options
-#include "ui/service_menu.h"	  // Para ServiceMenu
 #include "smart_sprite.h"		  // Para SmartSprite
 #include "stage.h"				  // Para number, get, Stage, total_power
 #include "tabe.h"				  // Para Tabe, TabeState
 #include "text.h"				  // Para Text
 #include "texture.h"			  // Para Texture
-#include "lang.h"
+#include "ui/service_menu.h"	  // Para ServiceMenu
 
 // Constructor
 Game::Game(int player_id, int current_stage, bool demo)
@@ -252,11 +249,6 @@ void Game::renderPlayers()
 		if (!player->isWaiting())
 		{
 			player->render();
-#ifdef DEBUG
-			// SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
-			// const Circle c = player->getCollider();
-			// DrawCircle(renderer, c.x, c.y, c.r);
-#endif
 		}
 	}
 }
diff --git a/source/sections/game.h b/source/sections/game.h
index 2fc04ca..81d659b 100644
--- a/source/sections/game.h
+++ b/source/sections/game.h
@@ -1,22 +1,18 @@
 #pragma once
 
-#include <SDL3/SDL.h>			  // Para SDL_Event
-#include <SDL3/SDL.h>			  // Para SDL_Renderer, SDL_Texture
-#include <SDL3/SDL.h>			  // Para Uint64, Uint8
-#include <memory>				  // Para shared_ptr, unique_ptr
-#include <string>				  // Para string
-#include <vector>				  // Para vector
+#include <SDL3/SDL.h> // Para SDL_Event, SDL_Renderer, SDL_Texture, Uint64, Uint8
+#include <memory>	  // Para shared_ptr, unique_ptr
+#include <string>	  // Para string
+#include <vector>	  // Para vector
+
 #include "manage_hiscore_table.h" // Para HiScoreEntry
-#include "options.h"			  // Para GameOptions, Options, options
+#include "options.h"			  // Para SettingsOptions, settings, DifficultyCode (ptr only)
 #include "player.h"				  // Para Player
 #include "utils.h"				  // Para Demo
 
-class Audio;
-class Asset;
 class Background;
 class Balloon;
 class BalloonManager;
-class Tabe;
 class Bullet;
 class Fade;
 class Input;
@@ -25,6 +21,7 @@ class PathSprite;
 class Scoreboard;
 class Screen;
 class SmartSprite;
+class Tabe;
 class Texture;
 enum class BulletType : Uint8;
 enum class ItemType;
diff --git a/source/sections/hiscore_table.cpp b/source/sections/hiscore_table.cpp
index 1a9b06b..91949b3 100644
--- a/source/sections/hiscore_table.cpp
+++ b/source/sections/hiscore_table.cpp
@@ -1,21 +1,20 @@
 #include "hiscore_table.h"
-#include <SDL3/SDL.h>			  // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>			  // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>			  // Para SDL_PixelFormat
-#include <SDL3/SDL.h>			  // Para SDL_SetRenderTarget, SDL_CreateTex...
-#include <SDL3/SDL.h>			  // Para SDL_GetTicks
-#include <stdlib.h>				  // Para rand, size_t
-#include <algorithm>			  // Para max
-#include <functional>			  // Para function
-#include <vector>				  // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderTarget
+#include <stdlib.h>	  // Para rand, size_t
+#include <algorithm>  // Para max
+#include <functional> // Para function
+#include <vector>	  // Para vector
+
+#include "audio.h"				  // Para Audio
 #include "background.h"			  // Para Background
 #include "fade.h"				  // Para Fade, FadeMode, FadeType
 #include "global_events.h"		  // Para check
-#include "global_inputs.h"		  // Para check, update
-#include "audio.h"				  // Para JA_GetMusicState, JA_Music_state
+#include "global_inputs.h"		  // Para check
+#include "input.h"				  // Para Input
 #include "lang.h"				  // Para getText
 #include "manage_hiscore_table.h" // Para HiScoreEntry
-#include "options.h"			  // Para GameOptions, Options, options
+#include "options.h"			  // Para SettingsOptions, settings
 #include "param.h"				  // Para Param, param, ParamGame, ParamFade
 #include "path_sprite.h"		  // Para PathSprite, Path, PathType
 #include "resource.h"			  // Para Resource
@@ -24,8 +23,7 @@
 #include "sprite.h"				  // Para Sprite
 #include "text.h"				  // Para Text, TEXT_SHADOW, TEXT_COLOR
 #include "texture.h"			  // Para Texture
-#include "utils.h"				  // Para Color, easeOutQuint, fade_color, Zone
-#include "input.h"
+#include "utils.h"				  // Para Color, easeOutQuint, NO_TEXT_COLOR
 
 // Constructor
 HiScoreTable::HiScoreTable()
diff --git a/source/sections/hiscore_table.h b/source/sections/hiscore_table.h
index ed64140..41404c0 100644
--- a/source/sections/hiscore_table.h
+++ b/source/sections/hiscore_table.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Renderer, SDL_Texture
-#include <SDL3/SDL.h> // Para Uint16, Uint32, Uint8
+#include <SDL3/SDL.h> // Para Uint16, SDL_FRect, SDL_Renderer, SDL_Texture, Uint64, Uint8
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <string>	  // Para string
 #include <vector>	  // Para vector
-#include "utils.h"
+
+#include "utils.h" // Para Color
 
 class Background;
 class Fade;
diff --git a/source/sections/instructions.cpp b/source/sections/instructions.cpp
index 3eabb44..88fad5f 100644
--- a/source/sections/instructions.cpp
+++ b/source/sections/instructions.cpp
@@ -1,26 +1,26 @@
 #include "instructions.h"
-#include <SDL3/SDL.h>	   // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>	   // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>	   // Para SDL_PIXELFORMAT_RGBA8888
-#include <SDL3/SDL.h>	   // Para SDL_GetTicks
-#include <algorithm>	   // Para max
-#include <array>		   // Para array
-#include <utility>		   // Para move
-#include <vector>		   // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderTarget, SDL_Re...
+#include <algorithm>  // Para max
+#include <array>	  // Para array
+#include <string>	  // Para basic_string, string
+#include <utility>	  // Para move
+#include <vector>	  // Para vector
+
+#include "audio.h"		   // Para Audio
 #include "fade.h"		   // Para Fade, FadeMode, FadeType
 #include "global_events.h" // Para check
-#include "global_inputs.h" // Para check, update
-#include "audio.h"		   // Para JA_GetMusicState, JA_Music_state
+#include "global_inputs.h" // Para check
+#include "input.h"		   // Para Input
 #include "lang.h"		   // Para getText
-#include "param.h"		   // Para Param, param, ParamGame, ParamFade
+#include "param.h"		   // Para Param, param, ParamGame, ParamFade, Param...
 #include "resource.h"	   // Para Resource
 #include "screen.h"		   // Para Screen
 #include "section.h"	   // Para Name, name, Options, options
 #include "sprite.h"		   // Para Sprite
-#include "text.h"		   // Para Text, TEXT_CENTER, TEXT_COLOR, TEXT_...
+#include "text.h"		   // Para Text, TEXT_CENTER, TEXT_COLOR, TEXT_SHADOW
 #include "tiled_bg.h"	   // Para TiledBG, TiledBGMode
-#include "utils.h"		   // Para Color, shdw_txt_color, Zone, no_color
-#include "input.h"
+#include "utils.h"		   // Para Color, SHADOW_TEXT_COLOR, Zone, NO_TEXT_C...
 
 // Constructor
 Instructions::Instructions()
diff --git a/source/sections/instructions.h b/source/sections/instructions.h
index 26513db..089f145 100644
--- a/source/sections/instructions.h
+++ b/source/sections/instructions.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Texture, SDL_Renderer
-#include <SDL3/SDL.h> // Para Uint32
+#include <SDL3/SDL.h> // Para SDL_Texture, Uint32, SDL_Renderer, SDL_FPoint, SDL_FRect, Uint64
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <vector>	  // Para vector
 
diff --git a/source/sections/intro.cpp b/source/sections/intro.cpp
index 4047e52..40f5b68 100644
--- a/source/sections/intro.cpp
+++ b/source/sections/intro.cpp
@@ -1,31 +1,30 @@
 #include "intro.h"
-#include <SDL3/SDL.h>	   // Para SDL_BLENDMODE_BLEND, SDL_BLENDMODE_MOD
-#include <SDL3/SDL.h>	   // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>	   // Para SDL_PIXELFORMAT_RGBA8888
-#include <SDL3/SDL.h>	   // Para SDL_FRect
-#include <SDL3/SDL.h>	   // Para SDL_SetTextureBlendMode, SDL_GetRend...
-#include <SDL3/SDL.h>	   // Para SDL_GetTicks
-#include <array>		   // Para array
-#include <functional>	   // Para function
-#include <string>		   // Para basic_string, string
-#include <utility>		   // Para move
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderDrawColor, SDL...
+#include <array>	  // Para array
+#include <functional> // Para function
+#include <iostream>	  // Para basic_ostream, basic_ostream::operator<<
+#include <string>	  // Para basic_string, char_traits, string
+#include <utility>	  // Para move
+
+#include "audio.h"		   // Para Audio
 #include "global_events.h" // Para check
-#include "global_inputs.h" // Para check, update
-#include "audio.h"		   // Para JA_PlayMusic, JA_StopMusic
+#include "global_inputs.h" // Para check
+#include "input.h"		   // Para Input
 #include "lang.h"		   // Para getText
-#include "param.h"		   // Para Param, ParamGame, param
+#include "param.h"		   // Para Param, param, ParamGame, ParamIntro, Para...
 #include "path_sprite.h"   // Para PathSprite, PathType
 #include "resource.h"	   // Para Resource
 #include "screen.h"		   // Para Screen
 #include "section.h"	   // Para Name, name, Options, options
+#include "text.h"		   // Para Text
 #include "texture.h"	   // Para Texture
 #include "tiled_bg.h"	   // Para TiledBG, TiledBGMode
-#include "utils.h"		   // Para Color, Zone, easeOutQuint, BLOCK
+#include "utils.h"		   // Para Color, Zone, easeInOutExpo, easeInElastic
 #include "writer.h"		   // Para Writer
-#include "input.h"
 
 #ifdef DEBUG
-#include <iomanip> // Para std::hex, std::setw, std::setfill
+#include <iomanip> // Para operator<<, setfill, setw
 #endif
 
 // Constructor
diff --git a/source/sections/intro.h b/source/sections/intro.h
index ebc58bc..360c6e6 100644
--- a/source/sections/intro.h
+++ b/source/sections/intro.h
@@ -1,12 +1,14 @@
 #pragma once
 
-#include <SDL3/SDL.h>	 // Para Uint32, Uint8
-#include <memory>		 // Para unique_ptr
-#include <vector>		 // Para vector
+#include <SDL3/SDL.h> // Para Uint32, Uint64
+#include <memory>	  // Para unique_ptr
+#include <vector>	  // Para vector
+
+#include "param.h"		 // Para Param, ParamIntro, param
 #include "path_sprite.h" // Para PathSprite
 #include "tiled_bg.h"	 // Para TiledBG
+#include "utils.h"		 // Para Color
 #include "writer.h"		 // Para Writer
-#include "param.h"
 
 /*
 	Esta clase gestiona un estado del programa. Se encarga de mostrar la secuencia
diff --git a/source/sections/logo.cpp b/source/sections/logo.cpp
index 23da4a1..d1ac91e 100644
--- a/source/sections/logo.cpp
+++ b/source/sections/logo.cpp
@@ -1,10 +1,13 @@
 #include "logo.h"
-#include <SDL3/SDL.h>	   // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>	   // Para SDL_GetTicks
-#include <utility>		   // Para move
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_PollEvent, SDL_Event
+#include <string>	  // Para basic_string
+#include <utility>	  // Para move
+
+#include "audio.h"		   // Para Audio
 #include "global_events.h" // Para check
-#include "global_inputs.h" // Para check, update
-#include "audio.h"		   // Para JA_FadeOutMusic, JA_PlaySound, JA_StopC...
+#include "global_inputs.h" // Para check
+#include "input.h"		   // Para Input
 #include "param.h"		   // Para Param, ParamGame, param
 #include "resource.h"	   // Para Resource
 #include "screen.h"		   // Para Screen
@@ -12,7 +15,6 @@
 #include "sprite.h"		   // Para Sprite
 #include "texture.h"	   // Para Texture
 #include "utils.h"		   // Para Color, Zone
-#include "input.h"
 
 // Constructor
 Logo::Logo()
diff --git a/source/sections/logo.h b/source/sections/logo.h
index 2a86824..c011a5f 100644
--- a/source/sections/logo.h
+++ b/source/sections/logo.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FPoint
-#include <SDL3/SDL.h> // Para Uint64
+#include <SDL3/SDL.h> // Para SDL_FPoint, Uint64
 #include <memory>	  // Para shared_ptr, unique_ptr
 #include <vector>	  // Para vector
 
diff --git a/source/sections/title.cpp b/source/sections/title.cpp
index 087c327..47719c9 100644
--- a/source/sections/title.cpp
+++ b/source/sections/title.cpp
@@ -1,34 +1,37 @@
 #include "title.h"
-#include <SDL3/SDL.h>		// Para SDL_PollEvent, SDL_Event, SDL_KEYDOWN
-#include <SDL3/SDL.h>		// Para SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5
-#include <SDL3/SDL.h>		// Para SDL_GetTicks
-#include <stddef.h>			// Para size_t
-#include <string>			// Para char_traits, operator+, basic_string
-#include <vector>			// Para vector
-#include "define_buttons.h" // Para DefineButtons
-#include "fade.h"			// Para Fade, FadeType
-#include "game_logo.h"		// Para GameLogo
-#include "global_inputs.h"	// Para check, update
-#include "input.h"			// Para Input, InputAction, INPUT_DO_NOT_ALLOW_R...
-#include "audio.h"			// Para JA_GetMusicState, JA_FadeOutMusic, JA_...
-#include "lang.h"			// Para getText
-#include "global_events.h"	// Para handleEvent
-#include "notifier.h"		// Para Notifier
-#include "options.h"		// Para OptionsController, Options, options
-#include "param.h"			// Para Param, param, ParamGame, ParamTitle
-#include "player.h"			// Para Player, PlayerState
-#include "resource.h"		// Para Resource
-#include "screen.h"			// Para Screen
-#include "section.h"		// Para Options, Name, name, AttractMode, options
-#include "sprite.h"			// Para Sprite
-#include "text.h"			// Para TEXT_CENTER, TEXT_SHADOW, Text
-#include "texture.h"		// Para Texture
-#include "tiled_bg.h"		// Para TiledBG, TiledBGMode
-#include "utils.h"			// Para Color, Zone, fade_color, no_color, BLOCK
-#include "ui/service_menu.h"
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, Uint32, SDL_EventType
+#include <stddef.h>	  // Para size_t
+#include <algorithm>  // Para find_if
+#include <iostream>	  // Para basic_ostream, basic_ostream::operator<<
+#include <string>	  // Para basic_string, char_traits, operator+
+#include <vector>	  // Para vector
+
+#include "audio.h"			 // Para Audio
+#include "define_buttons.h"	 // Para DefineButtons
+#include "fade.h"			 // Para Fade, FadeType
+#include "game_logo.h"		 // Para GameLogo
+#include "global_events.h"	 // Para check
+#include "global_inputs.h"	 // Para check
+#include "input.h"			 // Para Input, INPUT_DO_NOT_ALLOW_REPEAT, Input...
+#include "lang.h"			 // Para getText
+#include "notifier.h"		 // Para Notifier
+#include "options.h"		 // Para GamepadOptions, controllers, getPlayerW...
+#include "param.h"			 // Para Param, param, ParamGame, ParamTitle
+#include "player.h"			 // Para Player, PlayerState
+#include "resource.h"		 // Para Resource
+#include "screen.h"			 // Para Screen
+#include "section.h"		 // Para Name, name, Options, options, AttractMode
+#include "sprite.h"			 // Para Sprite
+#include "text.h"			 // Para TEXT_CENTER, TEXT_SHADOW, Text
+#include "tiled_bg.h"		 // Para TiledBG, TiledBGMode
+#include "ui/service_menu.h" // Para ServiceMenu
+#include "utils.h"			 // Para Color, Zone, NO_TEXT_COLOR, TITLE_SHADO...
+
+class Texture;
 
 #ifdef DEBUG
-#include <iomanip> // Para std::hex, std::setw, std::setfill
+#include <iomanip> // Para operator<<, setfill, setw
 #endif
 
 // Constructor
diff --git a/source/sections/title.h b/source/sections/title.h
index a414023..f893d24 100644
--- a/source/sections/title.h
+++ b/source/sections/title.h
@@ -3,6 +3,7 @@
 #include <SDL3/SDL.h> // Para Uint32
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <vector>
+
 #include "section.h" // Para Options
 
 class DefineButtons;
diff --git a/source/smart_sprite.cpp b/source/smart_sprite.cpp
index 1989e70..e890ca1 100644
--- a/source/smart_sprite.cpp
+++ b/source/smart_sprite.cpp
@@ -1,4 +1,5 @@
 #include "smart_sprite.h"
+
 #include "moving_sprite.h" // Para MovingSprite
 
 // Actualiza la posición y comprueba si ha llegado a su destino
diff --git a/source/smart_sprite.h b/source/smart_sprite.h
index 1b0746a..4fcdaca 100644
--- a/source/smart_sprite.h
+++ b/source/smart_sprite.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>			 // Para shared_ptr
+
 #include "animated_sprite.h" // Para AnimatedSprite
 
 class Texture;
diff --git a/source/sprite.cpp b/source/sprite.cpp
index 4773837..3a535b7 100644
--- a/source/sprite.cpp
+++ b/source/sprite.cpp
@@ -1,4 +1,5 @@
 #include "sprite.h"
+
 #include "texture.h" // Para Texture
 
 // Constructor
diff --git a/source/stage.cpp b/source/stage.cpp
index 89ef987..903c916 100644
--- a/source/stage.cpp
+++ b/source/stage.cpp
@@ -1,4 +1,5 @@
 #include "stage.h"
+
 #include <algorithm> // Para min
 #include <vector>    // Para vector
 
diff --git a/source/tabe.cpp b/source/tabe.cpp
index 43e0d9d..58de023 100644
--- a/source/tabe.cpp
+++ b/source/tabe.cpp
@@ -1,9 +1,13 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include "tabe.h"
-#include <SDL3/SDL.h> // Para SDL_FlipMode
+
+#include <SDL3/SDL.h> // Para SDL_FlipMode, SDL_GetTicks
 #include <stdlib.h>   // Para rand, abs
 #include <algorithm>  // Para max
-#include "audio.h"    // Para JA_PlaySound
+#include <cmath>      // Para abs
+#include <string>     // Para basic_string
+
+#include "audio.h"    // Para Audio
 #include "param.h"    // Para Param, ParamGame, param
 #include "resource.h" // Para Resource
 #include "utils.h"    // Para Zone
diff --git a/source/tabe.h b/source/tabe.h
index 8fd2a0f..cf492ce 100644
--- a/source/tabe.h
+++ b/source/tabe.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <SDL3/SDL.h>        // Para SDL_FRect
-#include <SDL3/SDL.h>        // Para Uint32
-#include <SDL3/SDL.h>        // Para SDL_GetTicks
-#include <stdlib.h>          // Para rand
-#include <memory>            // Para unique_ptr
+#include <SDL3/SDL.h> // Para Uint32, SDL_GetTicks, SDL_FRect
+#include <stdlib.h>   // Para rand
+#include <memory>     // Para unique_ptr
+
 #include "animated_sprite.h" // Para AnimatedSprite
 
 // --- Enumeraciones para dirección y estado ---
diff --git a/source/text.cpp b/source/text.cpp
index 00b19dc..e358d4f 100644
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -1,16 +1,15 @@
 #include "text.h"
-#include <SDL3/SDL.h> // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h> // Para SDL_PixelFormat
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_SetRenderTarget, SDL_GetRenderTa...
+
+#include <SDL3/SDL.h> // Para SDL_SetRenderTarget, SDL_GetRenderTarget, Uint8
 #include <stddef.h>	  // Para size_t
-#include <fstream>	  // Para basic_ifstream, basic_istream, basic...
+#include <fstream>	  // Para basic_ifstream, basic_istream, basic_ostream
 #include <iostream>	  // Para cerr
 #include <stdexcept>  // Para runtime_error
-#include "screen.h"	  // Para Screen
-#include "sprite.h"	  // Para Sprite
-#include "texture.h"  // Para Texture
-#include "utils.h"	  // Para Color, getFileName, printWithDots
+
+#include "screen.h"	 // Para Screen
+#include "sprite.h"	 // Para Sprite
+#include "texture.h" // Para Texture
+#include "utils.h"	 // Para Color, getFileName, printWithDots
 
 // Llena una estructuta TextFile desde un fichero
 std::shared_ptr<TextFile> loadTextFile(const std::string &file_path)
diff --git a/source/text.h b/source/text.h
index 7d55aed..67e7f5e 100644
--- a/source/text.h
+++ b/source/text.h
@@ -3,6 +3,7 @@
 #include <SDL3/SDL.h> // Para Uint8
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <string>	  // Para string
+
 #include "sprite.h"	  // Para Sprite
 #include "utils.h"	  // Para Color
 
diff --git a/source/texture.cpp b/source/texture.cpp
index 4d52f0d..badfc39 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,19 +1,17 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "texture.h"
-#include <SDL3/SDL.h>	  // Para SDL_GetError
-#include <SDL3/SDL.h>	  // Para SDL_LogError, SDL_LogCategory, SDL_Log...
-#include <SDL3/SDL.h>	  // Para SDL_CreateSurfaceFrom, SDL_DestroySurface
-#include <stdint.h>		  // Para uint32_t
-#include <cstring>		  // Para memcpy, size_t
-#include <fstream>		  // Para basic_ifstream, basic_ios, ios, operator|
-#include <stdexcept>	  // Para runtime_error
-#include <string>		  // Para operator+, char_traits, string, operat...
-#include <fstream>		  // Para basic_ifstream, basic_ostream, basic_ist...
-#include <iostream>		  // Para cerr
-#include <sstream>		  // Para basic_istringstream
-#include <vector>		  // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_LogError, SDL_LogCategory, Uint8, SDL_...
+#include <stdint.h>	  // Para uint32_t
+#include <cstring>	  // Para memcpy
+#include <fstream>	  // Para basic_ifstream, basic_istream, basic_ios
+#include <sstream>	  // Para basic_istringstream
+#include <stdexcept>  // Para runtime_error
+#include <string>	  // Para basic_string, char_traits, operator+, string
+#include <vector>	  // Para vector
+
 #include "external/gif.h" // Para Gif
-#include "stb_image.h"	  // Para stbi_image_free, stbi_load, STBI_rgb_a...
+#include "stb_image.h"	  // Para stbi_image_free, stbi_load, STBI_rgb_alpha
 #include "utils.h"		  // Para getFileName, Color, printWithDots
 
 // Constructor
diff --git a/source/texture.h b/source/texture.h
index 5fd77c7..6df34b2 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -1,13 +1,10 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_BlendMode
-#include <SDL3/SDL.h> // Para SDL_PixelFormat
-#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Renderer, SDL_TextureAccess, SDL_Texture
-#include <SDL3/SDL.h> // Para Uint8, Uint16, Uint32
-#include <SDL3/SDL.h> // Para SDL_FlipMode
+#include <SDL3/SDL.h> // Para Uint8, SDL_Renderer, Uint16, SDL_FlipMode, SDL_PixelFormat, SDL_TextureAccess, SDL_Texture, Uint32, SDL_BlendMode, SDL_FPoint, SDL_FRect
+#include <stddef.h>   // Para size_t
+#include <array>      // Para array
 #include <memory>     // Para shared_ptr
-#include <string>     // Para string
+#include <string>     // Para string, basic_string
 #include <vector>     // Para vector
 
 struct Color;
diff --git a/source/tiled_bg.cpp b/source/tiled_bg.cpp
index 27b9387..2d36bb2 100644
--- a/source/tiled_bg.cpp
+++ b/source/tiled_bg.cpp
@@ -1,8 +1,11 @@
 #include "tiled_bg.h"
-#include <SDL3/SDL.h> // Para SDL_PIXELFORMAT_RGBA8888
+
+#include <SDL3/SDL.h> // Para SDL_SetRenderTarget, SDL_CreateTexture, SDL_De...
 #include <stdlib.h>   // Para rand
 #include <cmath>      // Para sin
 #include <memory>     // Para unique_ptr, make_unique
+#include <string>     // Para basic_string
+
 #include "resource.h" // Para Resource
 #include "screen.h"   // Para Screen
 #include "sprite.h"   // Para Sprite
diff --git a/source/tiled_bg.h b/source/tiled_bg.h
index fcd6f12..9439b71 100644
--- a/source/tiled_bg.h
+++ b/source/tiled_bg.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Renderer, SDL_Texture
-#include "utils.h"
+#include <SDL3/SDL.h> // Para SDL_FRect, SDL_SetTextureColorMod, SDL_Renderer, SDL_Texture
+
+#include "utils.h" // Para Color
 
 // Modos de funcionamiento para el tileado de fondo
 enum class TiledBGMode : int
diff --git a/source/ui/menu_renderer.cpp b/source/ui/menu_renderer.cpp
index 77f181a..64d50c6 100644
--- a/source/ui/menu_renderer.cpp
+++ b/source/ui/menu_renderer.cpp
@@ -1,9 +1,13 @@
 #include "menu_renderer.h"
-#include "text.h"
-#include "menu_option.h" // Necesario para acceder a las opciones
-#include "screen.h"      // Para param
-#include <array>
-#include "param.h"
+
+#include <algorithm> // Para max
+#include <string>    // Para basic_string
+#include <utility>   // Para pair, move
+
+#include "menu_option.h" // Para MenuOption
+#include "param.h"       // Para Param, param, ParamServiceMenu, ParamGame
+#include "screen.h"      // Para Screen
+#include "text.h"        // Para Text, TEXT_CENTER, TEXT_COLOR
 
 MenuRenderer::MenuRenderer(const ServiceMenu *menu_state, std::shared_ptr<Text> element_text, std::shared_ptr<Text> title_text)
     : element_text_(std::move(element_text)), title_text_(std::move(title_text)) {}
diff --git a/source/ui/menu_renderer.h b/source/ui/menu_renderer.h
index edced69..5624685 100644
--- a/source/ui/menu_renderer.h
+++ b/source/ui/menu_renderer.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <memory>
-#include <string>
-#include <vector>
-#include <SDL3/SDL.h>
-#include "ui/service_menu.h" // Necesario para las enums y para acceder al estado del menú
+#include <SDL3/SDL.h> // Para SDL_FRect, Uint32
+#include <stddef.h>   // Para size_t
+#include <memory>     // Para shared_ptr, unique_ptr
+#include <vector>     // Para vector
+
+#include "ui/service_menu.h" // Para ServiceMenu
 #include "utils.h"           // Para Color
 
+class MenuOption;
 // Forward declarations
 class Text;
-class MenuOption;
 
 class MenuRenderer
 {
diff --git a/source/ui/service_menu.cpp b/source/ui/service_menu.cpp
index 0dabad8..b128a09 100644
--- a/source/ui/service_menu.cpp
+++ b/source/ui/service_menu.cpp
@@ -1,12 +1,16 @@
 #include "ui/service_menu.h"
-#include "menu_renderer.h"
-#include "menu_option.h"
-#include "resource.h"
-#include "audio.h"
-#include "section.h"
-#include "screen.h"
-#include "asset.h"
-#include "param.h"
+
+#include "audio.h"         // Para Audio
+#include "lang.h"          // Para getText, getCodeFromName, getNameFromCode
+#include "menu_option.h"   // Para MenuOption, BoolOption, ActionOption, Int...
+#include "menu_renderer.h" // Para MenuRenderer
+#include "options.h"       // Para PendingChanges, VideoOptions, pending_cha...
+#include "param.h"         // Para Param, param, ParamGame, ParamServiceMenu
+#include "resource.h"      // Para Resource
+#include "screen.h"        // Para Screen
+#include "section.h"       // Para Name, name, Options, options
+#include "ui/ui_message.h" // Para UIMessage
+#include "utils.h"         // Para Zone
 
 // Singleton
 ServiceMenu *ServiceMenu::instance_ = nullptr;
diff --git a/source/ui/service_menu.h b/source/ui/service_menu.h
index db4ae2c..b7b36d9 100644
--- a/source/ui/service_menu.h
+++ b/source/ui/service_menu.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <vector>
-#include <utility>
-#include <string>
-#include <memory>
-#include "utils.h"
-#include "ui_message.h"
+#include <stddef.h> // Para size_t
+#include <memory>   // Para unique_ptr
+#include <string>   // Para basic_string, string
+#include <utility>  // Para pair
+#include <vector>   // Para vector
+
+#include "ui_message.h" // Para UIMessage
 
-// Forward Declarations
-class Text;
 class MenuOption;
 class MenuRenderer; // <-- Nuevo
 
diff --git a/source/ui/ui_message.cpp b/source/ui/ui_message.cpp
index 54f39c7..a57dc1f 100644
--- a/source/ui/ui_message.cpp
+++ b/source/ui/ui_message.cpp
@@ -1,6 +1,8 @@
 #include "ui_message.h"
-#include <cmath>    // Para pow
-#include "screen.h" // Para param y TEXT_CENTER
+
+#include <cmath> // Para pow
+
+#include "text.h" // Para TEXT_CENTER, TEXT_COLOR, Text
 
 // Constructor: inicializa el renderizador, el texto y el color del mensaje
 UIMessage::UIMessage(std::shared_ptr<Text> text_renderer, const std::string &message_text, const Color &color)
diff --git a/source/ui/ui_message.h b/source/ui/ui_message.h
index f9006ef..5da7e9d 100644
--- a/source/ui/ui_message.h
+++ b/source/ui/ui_message.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#include <string>
-#include <memory>
-#include "text.h"
+#include <memory> // Para shared_ptr
+#include <string> // Para string, basic_string
+
 #include "utils.h" // Para Color
 
+class Text;
+
 // Clase para mostrar mensajes animados en la interfaz de usuario
 class UIMessage
 {
diff --git a/source/utils.cpp b/source/utils.cpp
index 2dcddd8..5e28bbc 100644
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -1,16 +1,16 @@
 #define _USE_MATH_DEFINES
 #include "utils.h"
-#include <SDL3/SDL.h> // Para SDL_CloseIO, SDL_IOFromFile, SDL_ReadIO
-#include <SDL3/SDL.h> // Para SDL_LogCategory, SDL_LogError, SDL_Lo...
-#include <stddef.h>   // Para size_t
+
+#include <SDL3/SDL.h> // Para SDL_RenderPoint, SDL_FRect, SDL_CloseIO, SDL_I...
 #include <algorithm>  // Para min, clamp, find_if_not, find, transform
 #include <cctype>     // Para tolower, isspace
-#include <cmath>      // Para pow, sin, M_PI, cos
+#include <cmath>      // Para pow, sinf, fmaxf, fminf, M_PI, fmodf, roundf, sin
 #include <compare>    // Para operator<
 #include <filesystem> // Para path
 #include <stdexcept>  // Para runtime_error
-#include <string>     // Para basic_string, string, operator==, ope...
-#include "lang.h"     // Para getText
+#include <string>     // Para basic_string, allocator, string, char_traits
+
+#include "lang.h" // Para getText
 
 // Variables
 Overrides overrides = Overrides();
diff --git a/source/utils.h b/source/utils.h
index 70b226f..96f6118 100644
--- a/source/utils.h
+++ b/source/utils.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <SDL3/SDL.h> // Para SDL_FRect, SDL_FPoint
-#include <SDL3/SDL.h> // Para SDL_Renderer
-#include <SDL3/SDL.h> // Para Uint8
+#include <SDL3/SDL.h> // Para Uint8, SDL_FRect, SDL_FPoint, SDL_Renderer
 #include <stdint.h>	  // Para int32_t
 #include <algorithm>  // Para max, min
-#include <string>	  // Para string
-#include <vector>	  // Para vector
 #include <array>	  // Para array
-#include <stdexcept>
+#include <cctype>	  // Para isxdigit
+#include <cstdlib>	  // Para abs, size_t
+#include <stdexcept>  // Para invalid_argument
+#include <string>	  // Para string, basic_string, stoi
+#include <vector>	  // Para vector
 
 // --- Constantes ---
 constexpr int BLOCK = 8;
diff --git a/source/writer.cpp b/source/writer.cpp
index 3bc569c..b33340e 100644
--- a/source/writer.cpp
+++ b/source/writer.cpp
@@ -1,4 +1,5 @@
 #include "writer.h"
+
 #include "text.h" // Para Text
 
 // Actualiza el objeto
diff --git a/source/writer.h b/source/writer.h
index 9ae18dc..bf42ed7 100644
--- a/source/writer.h
+++ b/source/writer.h
@@ -2,6 +2,7 @@
 
 #include <memory> // Para shared_ptr
 #include <string> // Para string
+
 class Text;
 
 // Clase Writer. Pinta texto en pantalla letra a letra a partir de una cadena y un objeto Text