Remove duplicate includes

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Constify methods

Based on TortoiseSVN 25243

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>