diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a3000cb..14b00878 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,10 @@ include:
   # Windows 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/windows-x64-mingw.yml'
+    
+  # Windows 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-mingw.yml'
 
   # Linux 64-bit
   - project: 'libretro-infrastructure/ci-templates'
@@ -50,6 +54,12 @@ libretro-build-windows-x64:
   extends:
     - .libretro-windows-x64-mingw-make-default
     - .core-defs
+    
+# Windows 32-bit
+libretro-build-windows-i686:
+  extends:
+    - .libretro-windows-i686-mingw-make-default
+    - .core-defs
 
 # Linux 64-bit
 libretro-build-linux-x64:
diff --git a/src/platform/libretro/glsym.h b/src/platform/libretro/glsym.h
deleted file mode 100644
index 30979aca..00000000
--- a/src/platform/libretro/glsym.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GLSYM_H__
-#define __LIBRETRO_SDK_GLSYM_H__
-
-#include <glsym/rglgen.h>
-
-#ifndef HAVE_PSGL
-#if defined(HAVE_OPENGLES2)
-#include <glsym/glsym_es2.h>
-#elif defined(HAVE_OPENGLES3)
-#include <glsym/glsym_es3.h>
-#else
-#endif
-#endif
-
-#endif
-
diff --git a/src/platform/libretro/main.cpp b/src/platform/libretro/main.cpp
index 38a752af..4fb3c5fd 100644
--- a/src/platform/libretro/main.cpp
+++ b/src/platform/libretro/main.cpp
@@ -4,11 +4,23 @@
 #include <string.h>
 #include <math.h>
 
-#ifdef _WIN32
-#include "glsym.h" // Use local modified glsym.h to allow compilation on 64bit Windows
+#ifdef _WIN32 // Fixes compiling on Windows
+#ifndef __LIBRETRO_SDK_GLSYM_H__
+#define __LIBRETRO_SDK_GLSYM_H__
+#include <glsym/rglgen.h>
+#ifndef HAVE_PSGL
+#if defined(HAVE_OPENGLES2)
+#include <glsym/glsym_es2.h>
+#else
+#ifdef HAVE_OPENGLES3
+#include <glsym/glsym_es3.h>
+#endif
+#endif
+#endif
 #else
 #include <glsym/glsym.h>
 #endif
+#endif
 
 #include <libretro.h>
 #include <file/file_path.h>