Modify the 'include' of several files
Rename machine API and improve some CPU related functions