corrected commit to include missing build-time includes