diff --git a/lib/modules/Crypto.pmod/aes.pike b/lib/modules/Crypto.pmod/aes.pike
deleted file mode 100644
index 9c3f7d9f2bd04a4c9c7783860bd102238778ea20..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/aes.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.aes is deprecated. Use Crypto.AES instead.
-
-inherit Crypto.aes;
diff --git a/lib/modules/Crypto.pmod/arcfour.pike b/lib/modules/Crypto.pmod/arcfour.pike
deleted file mode 100644
index a38b99bb0d3a231ed01bfdf6ee6b904d5d4f144e..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/arcfour.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.arcfour is deprecated. Use Crypto.Arcfour instead.
-
-inherit Crypto.arcfour;
diff --git a/lib/modules/Crypto.pmod/cast.pike b/lib/modules/Crypto.pmod/cast.pike
deleted file mode 100644
index 61cd7508392a2d1c3248fe9a480c58d004148334..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/cast.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.cast is deprecated. Use Crypto.CAST instead.
-
-inherit Crypto.cast;
diff --git a/lib/modules/Crypto.pmod/des.pike b/lib/modules/Crypto.pmod/des.pike
deleted file mode 100644
index c81c41816cf4b14a656d325e1f68cd0a66b1f389..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/des.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.des is deprecated. Use Crypto.DES instead.
-
-inherit Crypto.des;
diff --git a/lib/modules/Crypto.pmod/des3.pike b/lib/modules/Crypto.pmod/des3.pike
deleted file mode 100644
index ae976e83e9399243853acbe98a23df74088d45c3..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/des3.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.des3 is deprecated. Use Crypto.DES3 instead.
-
-inherit Crypto.des3;
diff --git a/lib/modules/Crypto.pmod/des3_cbc.pike b/lib/modules/Crypto.pmod/des3_cbc.pike
deleted file mode 100644
index d54c8331eed7f52363fd9b1ef069fa693d6c6a3a..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/des3_cbc.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.des3_cbc is deprecated. Use Crypto.CBC(Crypto.DES3) instead.
-
-inherit Crypto.des3_cbc;
diff --git a/lib/modules/Crypto.pmod/des_cbc.pike b/lib/modules/Crypto.pmod/des_cbc.pike
deleted file mode 100644
index bac5dae8c2aadb8f9e74a51f0193ff0da3446984..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/des_cbc.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.des_cbc is deprecated. Use Crypto.CBC(Crypto.DES) instead.
-
-inherit Crypto.des_cbc;
diff --git a/lib/modules/Crypto.pmod/dsa.pike b/lib/modules/Crypto.pmod/dsa.pike
deleted file mode 100644
index ac5ad659d989f67c0a57c8b9b62897f139d1c1cd..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/dsa.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.dsa is deprecated. Use Crypto.DSA instead.
-
-inherit Crypto.dsa;
diff --git a/lib/modules/Crypto.pmod/hmac.pike b/lib/modules/Crypto.pmod/hmac.pike
deleted file mode 100644
index 254a8980bd21484d5e61dd07f12ffe2edd9719a0..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/hmac.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.hmac is deprecated. Use Crypto.HMAC instead.
-
-inherit Crypto.hmac;
diff --git a/lib/modules/Crypto.pmod/idea.pike b/lib/modules/Crypto.pmod/idea.pike
deleted file mode 100644
index 2509f5985cbf9c9784e3ffaac2ce487193547f2e..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/idea.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.idea is deprecated. Use Crypto.IDEA instead.
-
-inherit Crypto.idea;
diff --git a/lib/modules/Crypto.pmod/idea_cbc.pike b/lib/modules/Crypto.pmod/idea_cbc.pike
deleted file mode 100644
index 2b6801abdc407c666210cf1a491159b9e01aaeed..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/idea_cbc.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.idea_cbc is deprecated. Use Crypto.CBC(Crypto.IDEA) instead.
-
-inherit Crypto.idea_cbc;
diff --git a/lib/modules/Crypto.pmod/md2.pike b/lib/modules/Crypto.pmod/md2.pike
deleted file mode 100644
index 3917b28bd93d24c56fe6fc1561a1f7c60cc70724..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/md2.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.md2 is deprecated. Use Crypto.MD2 instead.
-
-inherit Crypto.md2;
diff --git a/lib/modules/Crypto.pmod/md4.pike b/lib/modules/Crypto.pmod/md4.pike
deleted file mode 100644
index 033bcae18d340c2e5761ebd274704cdaa00053c2..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/md4.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.md4 is deprecated. Use Crypto.MD4 instead.
-
-inherit Crypto.md4;
diff --git a/lib/modules/Crypto.pmod/md5.pike b/lib/modules/Crypto.pmod/md5.pike
deleted file mode 100644
index b2dd6975a0ccbe31689046b1974a354fa067a259..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/md5.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.md5 is deprecated. Use Crypto.MD5 instead.
-
-inherit Crypto.md5;
diff --git a/lib/modules/Crypto.pmod/module.pmod b/lib/modules/Crypto.pmod/module.pmod
index df3f8e31c0033e937a9c17a29ff65007e54a6328..68b4d8571d70a8579a05a442c68192af82ae84ee 100644
--- a/lib/modules/Crypto.pmod/module.pmod
+++ b/lib/modules/Crypto.pmod/module.pmod
@@ -83,4 +83,34 @@ class Cipher
 constant CBC = Nettle.CBC;
 constant Buffer = Nettle.Proxy;
 
+// Phase out classes. Remove in Pike 7.7.
+
+#define PHASER(X,Y) static int(0..1) X##whiner; \
+class X { \
+  static int do_whine = X##whiner?0:(X##whiner = \
+    !!Stdio.stderr->write("Crypto." #X " is deprecated. Use Crypto." \
+                        #Y " instead.\n")); \
+  inherit Crypto.X; \
+}
+
+#pike 7.4
+PHASER(aes,AES);
+PHASER(arcfour,Arcfour);
+PHASER(cast,CAST);
+PHASER(des,DES);
+PHASER(des3,DES3);
+PHASER(des_cbc,CBC(Crypto.DES));
+PHASER(des3_cbc,CBC(Crypto.DES3));
+PHASER(dsa,DSA);
+PHASER(hmac,HMAC);
+PHASER(idea,IDEA);
+PHASER(idea_cbc,CBC(Crypto.IDEA));
+PHASER(md2,MD2);
+PHASER(md4,MD4);
+PHASER(md5,MD5);
+PHASER(rijndael,AES);
+PHASER(rsa,RSA);
+PHASER(sha,SHA1);
+
+
 #endif /* constant(Nettle.HashInfo) */
diff --git a/lib/modules/Crypto.pmod/rijndael.pike b/lib/modules/Crypto.pmod/rijndael.pike
deleted file mode 100644
index cc19fa80957bfe57c82e477bf840e5265b575e22..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/rijndael.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.rijndael is deprecated. Use Crypto.AES instead.
-
-inherit Crypto.aes;
diff --git a/lib/modules/Crypto.pmod/rsa.pike b/lib/modules/Crypto.pmod/rsa.pike
deleted file mode 100644
index 6a7fc659f8a686b1b4e75440d91eec6d7dcb0574..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/rsa.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.rsa is deprecated. Use Crypto.RSA instead.
-
-inherit Crypto.rsa;
diff --git a/lib/modules/Crypto.pmod/sha.pike b/lib/modules/Crypto.pmod/sha.pike
deleted file mode 100644
index 136f20c30b5da9072f25c1b020398a6d48a4042f..0000000000000000000000000000000000000000
--- a/lib/modules/Crypto.pmod/sha.pike
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#pike 7.4
-
-#warning Crypto.sha is deprecated. Use Crypto.SHA1 instead.
-
-inherit Crypto.sha;