bb407f9 Use global instead of define

Authored and Committed by mbooth 8 years ago
    Use global instead of define
    
    - Move more bundles into SDK that should be there
    - Remove forbidden SCL macros
    - Minor other changes to make it easier to auto-SCLise
    
        
file modified
+53 -39