fixed circular includes, complaining about nm_devicez, george to fix?
Merge branch 'master' of https://Github.com/JamesGlanville/GF2