Add missing header to resolve warning, improve Makefile
Authored by: xxj 2016-05-05
Parent: [r526]
Child: [r528]