C++ rebuild

Signed-off-by: Sebastian Niemann <niemann@sra.uni-hannover.de>