Fixed some unused typedefs warnings
Merge branch 'hotfix/warnings'