Move defines to header file