more missing includes (should fix Ubuntu build)