Some tweaks to header syntax to compile without warnings in nvcc.