Removed unnecessary header includes + added PIDs 16, 17, 18 & 20 by default for the scan