1149 fix
removed double includes
Merge remote-tracking branch 'origin/master'