Added correct headers to static library build.