better incremental build declarations - thanks @erdi