diff --git a/src/SFML/Window/Linux/GlxContext.cpp b/src/SFML/Window/Linux/GlxContext.cpp
index 026c2d079..a213ddf73 100644
--- a/src/SFML/Window/Linux/GlxContext.cpp
+++ b/src/SFML/Window/Linux/GlxContext.cpp
@@ -69,11 +69,11 @@ myWindow    (0),
 myContext   (NULL),
 myOwnsWindow(false)
 {
-    // Use the same context as the owner window (important!)
+    // Use the same display as the owner window (important!)
     myDisplay = static_cast<const WindowImplX11*>(owner)->GetDisplay();
 
     // Get the owner window and its device context
-    myWindow = static_cast<Window>(owner->GetSystemHandle());
+    myWindow = static_cast< ::Window>(owner->GetSystemHandle());
 
     // Create the context
     if (myWindow)
diff --git a/src/SFML/Window/Linux/InputImpl.cpp b/src/SFML/Window/Linux/InputImpl.cpp
index b876f0333..9ebb08395 100644
--- a/src/SFML/Window/Linux/InputImpl.cpp
+++ b/src/SFML/Window/Linux/InputImpl.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Linux/InputImpl.hpp>
+#include <SFML/Window/Mouse.hpp>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>