includes "
Revert "includes ""

This reverts commit e151cfbcacfa32cf98004a6c4e42d31ad1140529.
includes ; to conditions, changes struct name