Fix for C++ includes introduced in 1f344a0, fixes #313