remove unused includes
Merge branch 'dcmt'