diff --git a/ssh/authfile.c b/ssh/authfile.c
index a22029e..0c42208 100644
--- a/ssh/authfile.c
+++ b/ssh/authfile.c
@@ -84,7 +84,7 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob,
 	u_char buf[8];
 	int r, cipher_num;
 	CipherContext ciphercontext;
-	Cipher *cipher;
+	struct sshcipher *cipher;
 	u_char *cp;
 
 	/*
@@ -422,7 +422,7 @@ sshkey_parse_private_rsa1(struct sshbuf *blob, const char *passphrase,
 	u_char *cp;
 	char *comment = NULL;
 	CipherContext ciphercontext;
-	Cipher *cipher;
+	struct sshcipher *cipher;
 	struct sshkey *prv = NULL;
 
 	*keyp = NULL;
diff --git a/ssh/cipher.h b/ssh/cipher.h
index 604c8f5..6ddf5e0 100644
--- a/ssh/cipher.h
+++ b/ssh/cipher.h
@@ -60,14 +60,13 @@
 #define CIPHER_ENCRYPT		1
 #define CIPHER_DECRYPT		0
 
-typedef struct sshcipher Cipher;
 typedef struct sshcipher_ctx CipherContext;
 
 struct sshcipher;
 struct sshcipher_ctx {
 	int	plaintext;
 	EVP_CIPHER_CTX evp;
-	Cipher *cipher;
+	struct sshcipher *cipher;
 };
 
 u_int	 cipher_mask_ssh1(int);
diff --git a/ssh/kex.h b/ssh/kex.h
index 836ff78..33ce4eb 100644
--- a/ssh/kex.h
+++ b/ssh/kex.h
@@ -81,7 +81,7 @@ enum kex_exchange {
 
 struct sshenc {
 	char	*name;
-	Cipher	*cipher;
+	struct sshcipher *cipher;
 	int	enabled;
 	u_int	key_len;
 	u_int	block_size;
diff --git a/ssh/packet.c b/ssh/packet.c
index 2e741a9..3ed70d8 100644
--- a/ssh/packet.c
+++ b/ssh/packet.c
@@ -266,7 +266,7 @@ struct ssh *
 ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
 {
 	struct session_state *state;
-	Cipher *none = cipher_by_name("none");
+	struct sshcipher *none = cipher_by_name("none");
 	int r;
 
 	if (none == NULL)
@@ -774,7 +774,7 @@ void
 ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number)
 {
 	struct session_state *state = ssh->state;
-	Cipher *cipher = cipher_by_number(number);
+	struct sshcipher *cipher = cipher_by_number(number);
 	int r;
 	const char *wmsg;