Compile fix, missing includes after last merge.