Updates to these files so that they compile and link proplerly.