Fixed build errors, missing includes.