Fix compile error due to subdirs