Fixing missing includes