Revert LIB, INCLUDE changes