Revert "Swapping to GNU build tools."

This reverts commit d06d89183dca1e833fee52343abc215d03708f1e.
Revert "Some fixes for various files as a result of adding the"

This reverts commit c0c9221da7386ac1bdec14e7cff87720997ef2a2.