FIX: issue #682 (Encapped #include duplicate checking broken)