Fixed missing header.
Merge remote-tracking branch 'origin/cpp' into interface

Conflicts:
	src/cuda_common.cu
Shanchen workaround. Needs proper fix in future.