Revert "Build seems to work without g++"

This reverts commit 3ab1b36d8d6cf8996a8eda2404ac6b69312ac63b.
Reverting "Revert "Build seems to work without g++""
Reverting "Build seems to work without g++"
Reverting "Added an open statement and removed a lot of superfluous module annotations."
Reverting "minor commit."
Reverting "Everything seems OK... a bit of semantic meaninglessness in one function though."
Revert "Everything seems OK... a bit of semantic meaninglessness in one"

This reverts commit 2ae570b35180410ee27dae13bf9283124cc917fb.
Intermediate commit. Not sure if this compiles.
Intermediate commit. libzone.a compiles definitely.
Something builds, but I'm not sure what.
It builds, and I think the linking is all right this time. Let's see
what comes next.