These changes were a direct result of using a semantic patch
More information can be found at http://www.emn.fr/x-info/coccinelle/

Modified some of the changes to avoid the extra define.
Signed-off-by: NStoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: NKarsten Keil <keil@b1-systems.de>