diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
index 911075de338..001839026b2 100644
--- a/dlls/evr/evr.c
+++ b/dlls/evr/evr.c
@@ -24,7 +24,6 @@
 
 #include "evr_private.h"
 #include "d3d9.h"
-#include "wine/strmbase.h"
 
 #include "initguid.h"
 #include "dxva2api.h"
diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h
index 65dcbb7a9bc..ad47bd28b78 100644
--- a/dlls/evr/evr_private.h
+++ b/dlls/evr/evr_private.h
@@ -21,6 +21,7 @@
 
 #include "dshow.h"
 #include "evr.h"
+#include "wine/strmbase.h"
 
 HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN;
 
diff --git a/dlls/evr/main.c b/dlls/evr/main.c
index 000ed7c55be..921e63535f9 100644
--- a/dlls/evr/main.c
+++ b/dlls/evr/main.c
@@ -36,18 +36,17 @@ static HINSTANCE instance_evr;
 
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
 {
-    TRACE("(%p, %d, %p)\n", instance, reason, reserved);
-
-    switch (reason)
+    if (reason == DLL_WINE_PREATTACH)
+        return FALSE; /* prefer native version */
+    else if (reason == DLL_PROCESS_ATTACH)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            instance_evr = instance;
-            DisableThreadLibraryCalls(instance);
-            break;
+        instance_evr = instance;
+        DisableThreadLibraryCalls(instance);
+    }
+    else if (reason == DLL_PROCESS_DETACH && !reserved)
+    {
+        strmbase_release_typelibs();
     }
-
     return TRUE;
 }