diff --git a/main.cpp b/main.cpp
index dca44b9..d166288 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,7 +17,9 @@ Código fuente creado por JailDesigner
 #include "units/input.h"
 #include "units/on_screen_keyboard.h"
 #include "quickcg.h"
+
 using namespace QuickCG;
+using namespace std;
 
 // Punteros
 SDL_Event *event;
@@ -311,7 +313,7 @@ void initFire()
 		// Hue goes from 0 to 85: red to yellow
 		// Saturation is always the maximum: 255
 		// Lightness is 0..255 for x=0..128, and 255 for x=128..255
-		ColorRGB color = HSLtoRGB(ColorHSL(x / 3, 255, std::min(255, x * 2)));
+		ColorRGB color = HSLtoRGB(ColorHSL(x / 3, 255, min(255, x * 2)));
 
 		// Pon en la paleta el color calculado
 		palette[x] = (Uint32)16777216 * 255 + 65536 * color.r + 256 * color.g + color.b;
@@ -390,12 +392,12 @@ void checkEvents()
 
 			case SDL_SCANCODE_F3:
 				--fireModifier;
-				fireModifier = std::max(0, fireModifier);
+				fireModifier = max(0, fireModifier);
 				break;
 
 			case SDL_SCANCODE_F4:
 				++fireModifier;
-				fireModifier = std::min(30, fireModifier);
+				fireModifier = min(30, fireModifier);
 				break;
 
 			case SDL_SCANCODE_SPACE:
diff --git a/units/on_screen_keyboard.cpp b/units/on_screen_keyboard.cpp
index c96bfdc..29a6cfb 100644
--- a/units/on_screen_keyboard.cpp
+++ b/units/on_screen_keyboard.cpp
@@ -172,8 +172,6 @@ void OnScreenKeyboard::setLayout()
         key.caption = allChars.substr(i, 1);
         layout.push_back(key);
 
-        // std::cout << key.caption << " " << key.col << " " << key.row << " " << std::endl;
-
         ++index_col;
         if (index_col == columns)
         {