Merge pull request #1617 from JPEWdev/master

Remove shadow typedef