fix include dirs when non-catkin package depends on catkin package (regression of #490)