- Move Lock_File and Unlock_File to files.h and static inline them
- Move the folder functions out of files.c and into folders.c
- Remove files.c
- Tidy up some includes