Missing includes

Change-Id: Ifc3be1a5c6e9219da5aa9da270f14aa96ab492ae