Split includes/HTMLForm

Change-Id: I6eabfdb064c0e35b69efe9d6142e94df4128b632