Add missing headers to support inline building