bugfix includes and names