diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt
index 76ada41c3..bf4908bb4 100644
--- a/libobs-opengl/CMakeLists.txt
+++ b/libobs-opengl/CMakeLists.txt
@@ -31,6 +31,9 @@ elseif(APPLE)
 	set(libobs-opengl_PLATFORM_DEPS
 		${COCOA}
 		${IOSURF})
+else()
+	set(libobs-opengl_PLATFORM_SOURCES
+		gl-x11.c)
 endif()
 
 set(libobs-opengl_SOURCES
diff --git a/libobs-opengl/gl-x11.c b/libobs-opengl/gl-x11.c
index 0d1413c3f..4e8b52404 100644
--- a/libobs-opengl/gl-x11.c
+++ b/libobs-opengl/gl-x11.c
@@ -211,7 +211,7 @@ fail0:
 	return NULL;
 }
 
-extern void gl_platform_destroy(struct gl_platform *platform) 
+void gl_platform_destroy(struct gl_platform *platform) 
 {
 	if (!platform)
 		return; 
diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
index f12af8bcc..1f89fa869 100644
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
@@ -61,7 +61,7 @@ char *find_plugin(const char *plugin)
 	if (check_lib_path(plugin, "obs-plugins/", &output))
 		return output.array;
 
-	if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins",
+	if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins/",
 				&output))
 		return output.array;
 
diff --git a/obs/qt-wrappers.cpp b/obs/qt-wrappers.cpp
index 8400c32f7..fadf23334 100644
--- a/obs/qt-wrappers.cpp
+++ b/obs/qt-wrappers.cpp
@@ -46,6 +46,6 @@ void QTToGSWindow(QWidget *widget, gs_window &gswindow)
 #elif __APPLE__
 	/* TODO: mac */
 #else
-	/* TODO: unix */
+	gswindow.id = widget->winId();
 #endif
 }