Remove tracker from prefixes of identifiers
Fix some includes
Merge pull request #1 from kyoushuu/prefix-change

Remove tracker from prefixes of identifiers & fix some includes