Actually add the file
Fix build order to avoid warning