Revert "GCC 4.8 fixes"

This reverts commit aec22c0ad3b5bda0c3ba3b8f1c749954d39dac05.
Makefile fixup