Move declarations for C90 support and cleanup