Merged other mk files into common