Fixed style problems (added includes for C++ types).