[CMake] headers and recompile part II

[Duncan Mac-Vicar Prett]

Ok this is even better:

- INCLUDE_DIRECTORIES in the top level _before_ the FIND_PACKAGE statements 
(then I dont need to use CMAKE_INCLUDE_DIRECTORIES_BEFORE)
- remove INCLUDE_DIREC.... from the subdirs.

Thanks for the pointers

Duncan