castor_windy: fix and cleanup inclusion

Change-Id: I91cb42026ab66da6498c1731fae23b2fed9bbe0f