Def Injected complete v479

Complete redo of DefInjected files. There should be no error.