diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp
index f21f3d431c..b57d59c80d 100644
--- a/Source/Core/VideoCommon/Src/MainBase.cpp
+++ b/Source/Core/VideoCommon/Src/MainBase.cpp
@@ -164,6 +164,10 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
 	return 0;
 }
 
+#if defined(HAVE_X11) && HAVE_X11
+static volatile u32 s_doStateRequested = FALSE;
+#endif
+ 
 static volatile struct
 {
 	unsigned char **ptr;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 58050d9de1..46331acd74 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -143,7 +143,7 @@ void DestroyXWindow(void)
 	XUnmapWindow(GLWin.dpy, GLWin.win);
 	GLWin.win = 0;
 	if (GLWin.xEventThread)
-		GLWin.xEventThread->WaitForDeath();
+		delete GLWin.xEventThread;
 	GLWin.xEventThread = NULL;
 	XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
 }