Fiexed the include path problem #321. (the test case for C++ may be necessary.)
Fixed line endings and whitespace.