Moved defines to header file