diff -up build/pkgs/rubiks/src/dik/cube.c.orig build/pkgs/rubiks/src/dik/cube.c
--- build/pkgs/rubiks/src/dik/cube.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/cube.c	2019-04-09 13:25:49.060985774 -0600
@@ -6,6 +6,7 @@ static void read_position();
 
 static int do_repeat = 0;
 
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff -up build/pkgs/rubiks/src/dik/globals.h.orig build/pkgs/rubiks/src/dik/globals.h
--- build/pkgs/rubiks/src/dik/globals.h.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/globals.h	2019-04-09 15:47:20.736919992 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define MAX_MOVES	30
 
diff -up build/pkgs/rubiks/src/dik/permcube.c.orig build/pkgs/rubiks/src/dik/permcube.c
--- build/pkgs/rubiks/src/dik/permcube.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/permcube.c	2019-04-09 13:24:49.733911356 -0600
@@ -1,5 +1,6 @@
 #include "globals.h"
 
+int
 perm_cube()
 {
 int i, j, k, tmp;
diff -up build/pkgs/rubiks/src/dik/prntsol.c.orig build/pkgs/rubiks/src/dik/prntsol.c
--- build/pkgs/rubiks/src/dik/prntsol.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/prntsol.c	2019-04-09 13:25:14.869519211 -0600
@@ -2,6 +2,7 @@
 
 static char m[] = "FRUBLD";
 
+void
 prnt_sol()
 {
 int i, j, k;
diff -up build/pkgs/rubiks/src/dik/setcube.c.orig build/pkgs/rubiks/src/dik/setcube.c
--- build/pkgs/rubiks/src/dik/setcube.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/setcube.c	2019-04-09 13:26:52.427996988 -0600
@@ -24,7 +24,7 @@ static char edges[12][2][2] = {
     {"FR", "RF"},
     {"FL", "LF"}};
 
-static cube_found, orient_found;
+static int cube_found, orient_found;
 
 static void find_corner(c)
 char *c;
diff -up build/pkgs/rubiks/src/dik/size222.c.orig build/pkgs/rubiks/src/dik/size222.c
--- build/pkgs/rubiks/src/dik/size222.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/size222.c	2019-04-09 13:29:43.371327964 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define NOMAX
 #include "trans/perm7.a"
@@ -17,6 +19,7 @@ int maximal;
 int gcount;
 int givemax;
 
+void
 do_pr(turns, count)
 int turns, count;
 {
@@ -29,6 +32,7 @@ int turns, count;
     fflush(stdout);
 }
 
+int
 try_one(num, count)
 int num, count;
 {
@@ -64,6 +68,7 @@ int i, j, nnum, counted = 0, k, l, max =
     return counted;
 }
 
+void
 try(count)
 int count;
 {
@@ -93,6 +98,7 @@ TYPE j;
     do_pr(count + 1, counted);
 }
 
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff -up build/pkgs/rubiks/src/dik/size333c.c.orig build/pkgs/rubiks/src/dik/size333c.c
--- build/pkgs/rubiks/src/dik/size333c.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/size333c.c	2019-04-09 13:30:16.257814499 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define EQUIV
 #define NOMAX
@@ -38,6 +40,7 @@ int maximal;
 int gcount;
 int givemax;
 
+void
 do_pr(turns, count)
 int turns, count;
 {
@@ -50,6 +53,7 @@ int turns, count;
     fflush(stdout);
 }
 
+int
 try_one(num, count)
 int num, count;
 {
@@ -122,6 +126,7 @@ int i, j, nnum, counted = 0, k, l, max,
     return wcounted;
 }
 
+void
 try(count)
 int count;
 {
@@ -151,6 +156,7 @@ TYPE j;
     do_pr(count + 1, counted);
 }
 
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff -up build/pkgs/rubiks/src/dik/sizedom.c.orig build/pkgs/rubiks/src/dik/sizedom.c
--- build/pkgs/rubiks/src/dik/sizedom.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/sizedom.c	2019-04-09 13:33:16.473000709 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define SUBGROUP
 #define EQUIV
@@ -39,6 +41,7 @@ int maximal;
 int gcount;
 int givemax;
 
+void
 do_pr(turns, count)
 int turns, count;
 {
@@ -51,6 +54,7 @@ int turns, count;
     fflush(stdout);
 }
 
+int
 try_one(num, count)
 int num, count;
 {
@@ -175,6 +179,7 @@ int i, j, nnum, counted = 0, k, l, max,
     return wcounted;
 }
 
+void
 try(count)
 int count;
 {
@@ -273,6 +278,7 @@ int cperm, eperm;
     init_turn(cperm, eperm);
 }
 
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff -up build/pkgs/rubiks/src/dik/sizekoc1.c.orig build/pkgs/rubiks/src/dik/sizekoc1.c
--- build/pkgs/rubiks/src/dik/sizekoc1.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/sizekoc1.c	2019-04-09 13:34:37.327738285 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define EQUIV
 #define NOMAX
@@ -28,6 +30,7 @@ int maximal;
 int gcount;
 int givemax;
 
+void
 do_pr(turns, count)
 int turns, count;
 {
@@ -40,6 +43,7 @@ int turns, count;
     fflush(stdout);
 }
 
+int
 try_one(num, count)
 int num, count;
 {
@@ -91,6 +95,7 @@ int i, j, nnum, counted = 0, k, l, max,
     return wcounted;
 }
 
+void
 try(count)
 int count;
 {
@@ -120,6 +125,7 @@ TYPE j;
     do_pr(count + 1, counted);
 }
 
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff -up build/pkgs/rubiks/src/dik/sizekoc2.c.orig build/pkgs/rubiks/src/dik/sizekoc2.c
--- build/pkgs/rubiks/src/dik/sizekoc2.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/sizekoc2.c	2019-04-09 13:35:21.151052650 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define EQUIV
 #define NOMAX
@@ -28,6 +30,7 @@ int maximal;
 int gcount;
 int givemax;
 
+void
 do_pr(turns, count)
 int turns, count;
 {
@@ -40,6 +43,7 @@ int turns, count;
     fflush(stdout);
 }
 
+int
 try_one(num, count)
 int num, count;
 {
@@ -128,6 +132,7 @@ int i, j, nnum, counted = 0, k, l, max,
     return wcounted;
 }
 
+void
 try(count)
 int count;
 {
@@ -157,6 +162,7 @@ TYPE j;
     do_pr(count + 1, counted);
 }
 
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff -up build/pkgs/rubiks/src/dik/sizesquare.c.orig build/pkgs/rubiks/src/dik/sizesquare.c
--- build/pkgs/rubiks/src/dik/sizesquare.c.orig	2008-01-04 01:26:59.000000000 -0700
+++ build/pkgs/rubiks/src/dik/sizesquare.c	2019-04-09 13:31:57.537233176 -0600
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define NOMAX
 #include "trans/perm4.a"
@@ -16,6 +18,7 @@ int maximal;
 int gcount;
 int givemax;
 
+void
 do_pr(turns, count)
 int turns, count;
 {
@@ -28,6 +31,7 @@ int turns, count;
     fflush(stdout);
 }
 
+int
 try_one(num, count)
 int num, count;
 {
@@ -56,6 +60,7 @@ int i, j, nnum, counted = 0, k, l, max =
     return counted;
 }
 
+void
 try(count)
 int count;
 {
@@ -85,6 +90,7 @@ TYPE j;
     do_pr(count + 1, counted);
 }
 
+int
 main(argc, argv)
 int argc;
 char *argv[];