Moved some definitions in c file.