I had a similar noise recently, described exactly the same as yours.
I took the stem and spacers off, cleaned them all with a rag (there can be quite a lot of grit worked in there) greased the inside and edges of the spacers and stem and re-attached (wipe away excess grease). Clicks had gone
You can also do the bearing cartridges at the same time (I had already done mine the week before, but it had not solved the problem).
That website linked to by betty swollocks is a great one to bookmark.
I took the stem and spacers off, cleaned them all with a rag (there can be quite a lot of grit worked in there) greased the inside and edges of the spacers and stem and re-attached (wipe away excess grease). Clicks had gone
You can also do the bearing cartridges at the same time (I had already done mine the week before, but it had not solved the problem).
That website linked to by betty swollocks is a great one to bookmark.