Command Script fixes for generating correct headers/ for include/src!