* Fixed header file and define issues