Hey! Hey! WTF??? We are discussing Gibson here and no one called me?
By the way there is something that always puzzled me. How foundative are cyborgs for the cyberpunk genre? Because, for istance, in 'Do Androids Dream of Electric Sheeps' there aren't any. Actually, there aren't androids as well, since replicants are by no means 'mechanical'.
By the regular definition, Androids don't have to be "mechanical" as long as they are artificial constructs which look like humans, they can be defined as androids. Theoretically they could be completely made of meat and flesh and bones and still be Androids.
As for Cyborgs, and sorry if this seems like a lecture, it's not intended to be, just trying to clarify my reasoning; Cyborgs or rather the connection between artificial and natural components is one of the core concepts of Cyberpunk, as is stuff like Virtual Realities, Megacities/Sprawls, a criminal subculture composed of samurais/warriors and hackers/deckers/riggers etc.., artificial intelligence of some form, Corporations replacing or at least surpassing governments, a relatively bleak outlook to the future and several other tropes or elements.
However, most people would agree that you don't need all of these components to classify a piece of media as Cyberpunk, you just need to use enough to paint a picture that resonates with the genre in general.
FE. many Cyberpunk novels have very little connection to space travel and yet, some of the defining novels, especially those by Walter Jon Williams feature FTL travel and space flights to a large extent, or books like Richard K. Morgan's Takeshi Kovac's series have FTL travels, ancient alien civilizations, human colonies in space and many other concepts which are usually more fitting in the genre of Space Opera or maybe even HARD SF (depending on how they are presented), yet the series also has enough elements of Cyberpunk that many people define it as part of the genre or at least as so-called Post-Cyberpunk (which I think should rather be called Neo-Cyberpunk tbh, like Neo-Noir).
What I mean by that is, there aren't completely clear-cut lines, what is important or what makes something cyberpunk, but I think no one would argue that some form of cybernetic organism, bioware or cybernetic improvements are definitive foundations of the genre.