Remove common definitions files
Remove common declarations