Revert change to definition of LCU_WIDTH.
Add missing include.