wq-update now amalgamates into single c and h files