Move some lua headers to client.
Fix merge test.