moved defines to header file