Reorganize some includes and declarations