Added #defines in some places.