Avoids dragging in IniFile, EXI device and SI device headers in this header which is quite widely used throughout the codebase. This also uncovered a few cases where indirect inclusions were being relied upon, which this also fixes.