10 files changed, 10 insertions, 11 deletions
diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas
index 9f455945..ce3b6046 100644
--- a/Game/Code/Screens/UScreenCredits.pas
+++ b/Game/Code/Screens/UScreenCredits.pas
@@ -15,7 +15,7 @@ uses
     SDL_Image,
     UDisplay,
     UTexture,
-    OpenGL12,
+    gl,
     UMusic,
     UFiles,
     SysUtils,
diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index 7a3ef3e8..7527dc68 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -98,7 +98,7 @@ uses UGraphic,
      UFiles,
      UMain,
      UIni,
-     OpenGL12,
+     gl,
      USkins;
 
 function TScreenEditConvert.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 8d4a3335..0a80af8b 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -23,7 +23,7 @@ uses
     ULyrics_bak,
     ULyrics,
     Math,
-    OpenGL12,
+    gl,
     {$IFDEF UseMIDIPort}
     MidiOut,
     {$ENDIF}
diff --git a/Game/Code/Screens/UScreenLoading.pas b/Game/Code/Screens/UScreenLoading.pas
index 9c13a85c..ee3c6f7f 100644
--- a/Game/Code/Screens/UScreenLoading.pas
+++ b/Game/Code/Screens/UScreenLoading.pas
@@ -13,7 +13,7 @@ uses
   SDL,
   SysUtils,
   UThemes,
-  OpenGL12;
+  gl;
 
 type
   TScreenLoading = class(TMenu)
diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas
index 7b983074..e409812c 100644
--- a/Game/Code/Screens/UScreenOpen.pas
+++ b/Game/Code/Screens/UScreenOpen.pas
@@ -5,7 +5,7 @@ interface
 {$I switches.inc}
 
 uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, UTexture, UMenuText,
-  ULyrics, Math, OpenGL12, UThemes;
+  ULyrics, Math, gl, UThemes;
 
 type
   TScreenOpen = class(TMenu)
diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index 6ee200fa..b9000991 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -61,7 +61,7 @@ implementation
 uses
   SysUtils,
   SDL,
-  OpenGL12,
+  gl,
   UGraphic,
   UDraw,
   UMain,
diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index 516d8df0..665b6ec0 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -16,10 +16,9 @@ uses
   UMusic,
   USongs,
   UThemes,
-  OpenGL12,
+  gl,
   math,
   UTexture;
-//  OpenGL;
 
 const
   ZBars            : real = 0.8; // Z value for the bars
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 7c4d69bd..8791accd 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -21,7 +21,7 @@ uses UMenu,
      UTexture,
      ULyrics,
      TextGL,
-     OpenGL12,
+     gl,
      UThemes,
      //ULCD, //TODO: maybe LCD Support as Plugin?
      UGraphicClasses,
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 480b9e11..4af999f1 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -21,7 +21,7 @@ uses UMenu,
      UTexture,
      ULyrics,
      TextGL,
-     OpenGL12,
+     gl,
 
      UThemes,
      //ULCD, //TODO: maybe LCD Support as Plugin?
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 609d46b1..4e7f22fe 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -131,7 +131,7 @@ uses UGraphic,
      UMain,
      UCovers,
      math,
-     OpenGL12,
+     gl,
      USkins,
      UDLLManager,
      UParty,