Keep variables in headers belonging to files

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
Missing headers

Without them D_ESCseen behaves in unpredictable ways

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>