Cleaner include/exclude for the core module

Change-Id: I42963f1f92735e51a040d956d84bb85f86d1deeb
Signed-off-by: John May <john.wilkinsonmay@gmail.com>