fix make file
fix type declarations, replace all file