added missing #include statements