Fix headers
Fix build