Fix for non-pch builds