Some more hard coded micron fixes.
Fix the wierd 500 milion bug.
Remove unused include.
Remove unused include.
Fix include case.
Merge branch 'master' into BFB