Fix build and add missing headers