Fixed|Heretic: Compilation error (missing header); cleanup