* fix some includes