Completely replace typedef by using

gcc 4.9 is now able to handle it