How many castles in Japan ?

[Maciamo]

I read somewhere there could have been up to 40.000 of them before Meiji, but I don't believe these numbers.

I've heard of more than 50 castles (+ ruins), but there may be smaller or less famous ones, and I'd like the exact number.

Here are the castles I know :

Big 5-tiered castles

Himeji
Osaka
Nagoya
Shimabara
Matsumoto
Fukuyama
Chiba
Kumamoto

Other big castles

Edo (Tokyo)
Nijou (Kyoto)
Okayama
Hiroshima
Wakayama
Matsue
Kanazawa
Imabari

Average size

Funai
Gifu
Gujouhachiman
Hikone
Hirado
Hirosaki
Iwakuni
Kishiwada
Kakegawa
Kaminoyama
Kouchi
Matsuyama
Marugame
Nakatsu
Odawara
Ogaki
Okazaki
Sekiyado
Shirakawa (=Komine)
Sunomata
Sunpu
Takamatsu

Minor castles

Haga
Hamamatsu
Kawanoe
Kitsuki
Kiyosu
Komaki
Inuyama
Iwamura
Izushi
Nagahama
Oshi
Shiroishi (=Masuoka)
Tatsuno
Uwajima
Zeze

Ruins

Akou
Bittsuutakamatsu
Goryokaku
Hachiouji
Hara
Hizennagoya
Hachimanyama
Hiji
Hitoyoshi
Kushima
Kasumiga (=Nihonmatsu)
Morioka
Oka
Ozu
Rikan
Sakamoto
Tokushima
Tsuyama
Tomioka
Takeda
Takatori
Tsuchiura
Yamanaka
Yamatokooriyama

This sites has pictures for those interested : http://www.shirofan.com/photo_library/index_e.html

Then I also found a guide to Japanese castles : http://www.jcastle.info/castle/index.html