Added missing headers to build step