Added ifndef for common header file