[PATCH] Juggle some includes, add cscope make target
3 files changed