Fix compiling with pragmasOnSave: false.
Fix includes in build case. Update tests.