Removed an unnecessary include in error.h
Some left over changes