Fixing hive includes