Added missing headers for static library.