dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

This partially reverts commit ac648bb835.

libavcodec/dxva2_internal.h

@@ -32,6 +32,11 @@
 
 #if CONFIG_DXVA2
 #include "dxva2.h"
+#endif
+#if CONFIG_D3D11VA
+#include "d3d11va.h"
+#endif
+#if HAVE_DXVA_H
 /* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h
  * defines nothing. Force the struct definitions to be visible. */
 #undef WINAPI_FAMILY
@@ -40,9 +45,6 @@
 #define _CRT_BUILD_DESKTOP_APP 0
 #include <dxva.h>
 #endif
-#if CONFIG_D3D11VA
-#include "d3d11va.h"
-#endif
 
 #include "avcodec.h"