To muddy the waters further a lot of Japanese minelayers had the designation maru as well, being former merchant vessels. They also converted a lot of merchants into gunboats and landing ships which kept their maru name suffix.
I'd say a gunboat counts as a warship. Has a gun.
