I still need to determine the best way to organize header files. I
think this is better than what I had before though, since the
compiler doesn't complain anymore.