Merge branch 'master' of https://github.com/coelckers/gzdoom

src/common/engine/namedef.h

@@ -810,6 +810,7 @@ xx(MoveBob)
 xx(StillBob)
 xx(ClassicFlight)
 xx(WBobSpeed)
+xx(WBobFire)
 xx(PlayerClass)
 xx(MonsterClass)
 xx(MorphedMonster)

src/common/platform/win32/win32basevideo.cpp

@@ -33,10 +33,7 @@
 */
 
 #include <windows.h>
-#include <GL/gl.h>
-#include "wglext.h"
 
-#include "gl_sysfb.h"
 #include "hardware.h"
 #include "x86.h"
 #include "templates.h"
@@ -52,8 +49,6 @@
 #include "win32basevideo.h"
 #include "cmdlib.h"
 
-#include "gl_framebuffer.h"
-
 CVAR(Int, vid_adapter, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
 //==========================================================================