diff --git a/source/credits.cpp b/source/credits.cpp
index dbaba8c..1227d22 100644
--- a/source/credits.cpp
+++ b/source/credits.cpp
@@ -4,7 +4,6 @@
 #include <SDL2/SDL_events.h>    // Para SDL_PollEvent, SDL_Event, SDL_QUIT
 #include <SDL2/SDL_pixels.h>    // Para SDL_PIXELFORMAT_RGBA8888
 #include <SDL2/SDL_timer.h>     // Para SDL_GetTicks
-#include <cstdlib>              // Para abs
 #include <algorithm>            // Para max, min, clamp
 #include <cstdlib>              // Para abs
 #include <stdexcept>            // Para runtime_error
diff --git a/source/director.cpp b/source/director.cpp
index 64f4b11..d633e64 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -9,42 +9,41 @@
 #include <SDL2/SDL_scancode.h>		 // Para SDL_SCANCODE_0, SDL_SCANCODE_DOWN
 #include <SDL2/SDL_stdinc.h>		 // Para SDL_bool, Uint32
 #include <errno.h>					 // Para errno, EEXIST, EACCES, ENAMETOO...
-#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 <chrono>					 // Para chrono
-#include <cstdlib>					 // Para exit, EXIT_FAILURE, size_t, rand
-#include <iostream>					 // Para basic_ostream, operator<<, basi...
-#include <memory>					 // Para make_unique, unique_ptr
-#include <stdexcept>				 // Para runtime_error
-#include <string>					 // Para operator+, char_traits, allocator
-#include <vector>					 // Para vector
-#include "asset.h"					 // Para Asset, AssetType
-#include "credits.h"				 // Para Credits
-#include "dbgtxt.h"					 // Para dbg_init
-#include "game.h"					 // Para Game, GAME_MODE_DEMO_OFF, GAME_...
-#include "hiscore_table.h"			 // Para HiScoreTable
-#include "input.h"					 // Para Input, InputType
-#include "instructions.h"			 // Para Instructions
-#include "intro.h"					 // Para Intro
-#include "jail_audio.h"				 // Para JA_SetMusicVolume, JA_SetSoundV...
-#include "lang.h"					 // Para Code, loadFromFile
-#include "logo.h"					 // Para Logo
-#include "manage_hiscore_table.h"	 // Para ManageHiScoreTable
-#include "notifier.h"				 // Para Notifier
-#include "on_screen_help.h"			 // Para OnScreenHelp
-#include "options.h"				 // Para Options, options, OptionsContro...
-#include "param.h"					 // Para Param, ParamGame, param, loadPa...
-#include "resource.h"				 // Para Resource
-#include "screen.h"					 // Para Screen
-#include "section.h"				 // Para Name, Options, name, options
-#include "title.h"					 // Para Title
-#include "utils.h"					 // Para Overrides, overrides
-
 #ifndef _WIN32
-#include <pwd.h> // para getpwuid, passwd
+#include <pwd.h> // Para getpwuid, passwd
 #endif
+#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 <chrono>				  // Para chrono
+#include <cstdlib>				  // Para exit, EXIT_FAILURE, size_t, rand
+#include <iostream>				  // Para basic_ostream, operator<<, basi...
+#include <memory>				  // Para make_unique, unique_ptr
+#include <stdexcept>			  // Para runtime_error
+#include <string>				  // Para operator+, char_traits, allocator
+#include <vector>				  // Para vector
+#include "asset.h"				  // Para Asset, AssetType
+#include "credits.h"			  // Para Credits
+#include "dbgtxt.h"				  // Para dbg_init
+#include "game.h"				  // Para Game, GAME_MODE_DEMO_OFF, GAME_...
+#include "hiscore_table.h"		  // Para HiScoreTable
+#include "input.h"				  // Para Input, InputType
+#include "instructions.h"		  // Para Instructions
+#include "intro.h"				  // Para Intro
+#include "jail_audio.h"			  // Para JA_SetMusicVolume, JA_SetSoundV...
+#include "lang.h"				  // Para Code, loadFromFile
+#include "logo.h"				  // Para Logo
+#include "manage_hiscore_table.h" // Para ManageHiScoreTable
+#include "notifier.h"			  // Para Notifier
+#include "on_screen_help.h"		  // Para OnScreenHelp
+#include "options.h"			  // Para Options, options, OptionsContro...
+#include "param.h"				  // Para Param, ParamGame, param, loadPa...
+#include "resource.h"			  // Para Resource
+#include "screen.h"				  // Para Screen
+#include "section.h"			  // Para Name, Options, name, options
+#include "title.h"				  // Para Title
+#include "utils.h"				  // Para Overrides, overrides
 
 // Constructor
 Director::Director(int argc, const char *argv[])
diff --git a/source/jail_audio.h b/source/jail_audio.h
index ecee426..597d875 100644
--- a/source/jail_audio.h
+++ b/source/jail_audio.h
@@ -1,8 +1,9 @@
 #pragma once
+
 #include <SDL2/SDL_audio.h>  // Para SDL_AudioFormat
 #include <SDL2/SDL_stdinc.h> // Para Uint32, Uint8
-struct JA_Music_t;           // lines 8-8
-struct JA_Sound_t;           // lines 7-7
+struct JA_Music_t;           // lines 4-4
+struct JA_Sound_t;           // lines 5-5
 
 enum JA_Channel_state
 {
@@ -21,9 +22,6 @@ enum JA_Music_state
     JA_MUSIC_DISABLED
 };
 
-struct JA_Sound_t;
-struct JA_Music_t;
-
 void JA_Init(const int freq, const SDL_AudioFormat format, const int channels);
 void JA_Quit();
 
diff --git a/source/mouse.cpp b/source/mouse.cpp
index 5fd857c..c853640 100644
--- a/source/mouse.cpp
+++ b/source/mouse.cpp
@@ -1,4 +1,6 @@
 #include "mouse.h"
+#include <SDL2/SDL_mouse.h> // Para SDL_ShowCursor
+#include <SDL2/SDL_timer.h> // Para SDL_GetTicks
 
 namespace Mouse
 {
diff --git a/source/mouse.h b/source/mouse.h
index 392ff8d..d99ea3c 100644
--- a/source/mouse.h
+++ b/source/mouse.h
@@ -1,5 +1,7 @@
 #pragma once
-#include <SDL2/SDL.h>
+
+#include <SDL2/SDL_events.h> // Para SDL_Event
+#include <SDL2/SDL_stdinc.h> // Para Uint32
 
 namespace Mouse
 {