#97 removes old topic specific includes.