fixed gentop include atomtypes

Change-Id: I1dd3b4ea98004112830cbd4b96cba22e3f96406c
more

Change-Id: I2a711909d0acdcea56f82f5e10b497ed90b5f134