diff --git a/CSFML/include/SFML/Graphics.h b/CSFML/include/SFML/Graphics.h
index 63afc6f4..2b3131c6 100644
--- a/CSFML/include/SFML/Graphics.h
+++ b/CSFML/include/SFML/Graphics.h
@@ -35,6 +35,7 @@
 #include <SFML/Graphics/PostFX.h>
 #include <SFML/Graphics/Rect.h>
 #include <SFML/Graphics/RenderWindow.h>
+#include <SFML/Graphics/Shape.h>
 #include <SFML/Graphics/Sprite.h>
 #include <SFML/Graphics/String.h>
 #include <SFML/Graphics/View.h>
diff --git a/CSFML/include/SFML/OpenGL.h b/CSFML/include/SFML/OpenGL.h
new file mode 100644
index 00000000..4801c706
--- /dev/null
+++ b/CSFML/include/SFML/OpenGL.h
@@ -0,0 +1,58 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_OPENGL_H
+#define SFML_OPENGL_H
+
+
+////////////////////////////////////////////////////////////
+/// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.h>
+
+
+////////////////////////////////////////////////////////////
+/// This file just includes the OpenGL (GL and GLU) headers,
+/// which have actually different paths on each system
+////////////////////////////////////////////////////////////
+#if defined(SFML_SYSTEM_WINDOWS)
+
+    #include <windows.h>
+    #include <GL/gl.h>
+    #include <GL/glu.h>
+
+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
+
+    #include <GL/gl.h>
+    #include <GL/glu.h>
+
+#elif defined(SFML_SYSTEM_MACOS)
+
+    #include <OpenGL/gl.h>
+    #include <OpenGL/glu.h>
+
+#endif
+
+
+#endif // SFML_OPENGL_H
diff --git a/include/SFML/OpenGL.hpp b/include/SFML/OpenGL.hpp
index 65da2e0f..f325dced 100644
--- a/include/SFML/OpenGL.hpp
+++ b/include/SFML/OpenGL.hpp
@@ -26,6 +26,12 @@
 #define SFML_OPENGL_HPP
 
 
+////////////////////////////////////////////////////////////
+/// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+
+
 ////////////////////////////////////////////////////////////
 /// This file just includes the OpenGL (GL and GLU) headers,
 /// which have actually different paths on each system