Merge branch 'peron/windows-build-regressions' into 'master'

Fix windows build regressions introduced in !790

See merge request eng/das/cov/gnatcoverage!806

Regression due to #397

Author: RenjiSann

tools/gnatcov/clang-wrapper.cc

@@ -20,8 +20,6 @@
 /* Make sure we refer to the static version of symbols on Windows, not to DLL
    importers.  */
 
-#include "clang-c/CXSourceLocation.h"
-#include "clang/AST/Expr.h"
 #define CINDEX_NO_EXPORTS
 
 #include "libclang/CXCursor.h"