#169 includes and defines revised