Style revision for framework/defcomp
Style revision for framework/runtime
Readded a mistakenly removed include