Add missing includes, take 2.