Fixes -Wmissing-prototypes warnings.
Also renamed some things that started with
underscore followed by uppercase letter,
which is reserved.

Change-Id: I3c59dc2fa7133fa2738327c7471d59815decf021