Third Ultimate merge with JB kernel changes
Fix missing defines
Optimize Compilation