made necessary changes to these files to compile using make