Flattened external include path

The only includedir is now "external". All the includes need to define the
sub-directories explicitly