moved more prototypes
moved more stuff
removed include guards
removed more typedefs
removed more typedefs
removed more stuff