Fixed: Include C++ headers