Core: Deleted Self inclusion

Signed-off-by: Christina Quast <chrysh.ng+github@gmail.com>
Core: Moved static function declarations

Moved declarations from header to C file

Signed-off-by: Christina Quast <chrysh.ng+github@gmail.com>