#17 (extra includes removed) issue fixed