fixed include file
fixed error on old gcc
removed CPPFLAGS
removed CPPFLAGS
Merge branch 'develop'