These logically belong together since it's a base commit plus followup fixes to less common build configurations. The patches are: Revert "CfgInterface: rename interface() to getInterface()" This reverts commita74fc48158. Revert "Wrap CfgTraitsFor in namespace llvm to please GCC 5" This reverts commitf2a06875b6. Revert "Try to make GCC5 happy about the CfgTraits thing" This reverts commit03a5f7ce12. Revert "Introduce CfgTraits abstraction" This reverts commitc0cdd22c72.