Add missing includes
Fix test.