castor: fix and cleanup inclusion

Change-Id: I6ddf67cd1768ca9b84927c5cca52ad1ee4cbe025