diff --git a/classes/findlib.bbclass b/classes/findlib.bbclass
deleted file mode 100644
index 54988a35c3..0000000000
--- a/classes/findlib.bbclass
+++ /dev/null
@@ -1,3 +0,0 @@
-DEPENDS_append = " ocaml-findlib-cross ocaml-findlib-config"
-export OCAMLFIND_CONF = "${OCAML_FINDLIB_CONF}"
-
diff --git a/recipes-devtools/ocaml/ocaml-camomile/ocaml-camomile-destdir.patch b/recipes-devtools/ocaml/ocaml-camomile/ocaml-camomile-destdir.patch
deleted file mode 100644
index e18321a843..0000000000
--- a/recipes-devtools/ocaml/ocaml-camomile/ocaml-camomile-destdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: camomile-0.8.1/Makefile.in
-===================================================================
---- camomile-0.8.1.orig/Makefile.in	2010-07-08 07:57:50.000000000 +0200
-+++ camomile-0.8.1/Makefile.in	2016-02-24 19:57:17.623840470 +0100
-@@ -406,19 +406,20 @@
- 	if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \
- 	if [ -f camomile.cmxa ]; then files="camomile.cmxa $$files"; fi&& \
- 	if [ -f camomile.a ]; then files="camomile.a $$files"; fi && \
--	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi
-+	mkdir -p $(DESTDIR)$(shell ocamlfind printconf destdir) && \
-+	ocamlfind install -destdir $(DESTDIR)$(shell ocamlfind printconf destdir) camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi
- 
- install-data:
--	mkdir -p '$(DATADIR)'
--	mkdir -p '$(DATADIR)'/camomile
--	mkdir -p '$(DATADIR)'/camomile/database
--	cp -f database/*.mar '$(DATADIR)'/camomile/database || true
--	mkdir -p '$(DATADIR)'/camomile/charmaps
--	cp -f charmaps/*.mar '$(DATADIR)'/camomile/charmaps || true
--	mkdir -p '$(DATADIR)'/camomile/mappings
--	cp -f mappings/*.mar '$(DATADIR)'/camomile/mappings || true
--	mkdir -p '$(DATADIR)'/camomile/locales
--	cp -f locales/*.mar '$(DATADIR)'/camomile/locales || true
-+	mkdir -p '$(DESTDIR)$(DATADIR)'
-+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile
-+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/database
-+	cp -f database/*.mar '$(DESTDIR)$(DATADIR)'/camomile/database || true
-+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/charmaps
-+	cp -f charmaps/*.mar '$(DESTDIR)$(DATADIR)'/camomile/charmaps || true
-+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/mappings
-+	cp -f mappings/*.mar '$(DESTDIR)$(DATADIR)'/camomile/mappings || true
-+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/locales
-+	cp -f locales/*.mar '$(DESTDIR)$(DATADIR)'/camomile/locales || true
- 
- uninstall: $(UNINSTALL)
- 
diff --git a/recipes-devtools/ocaml/ocaml-camomile_0.8.1.bb b/recipes-devtools/ocaml/ocaml-camomile_0.8.1.bb
deleted file mode 100644
index b39939d19a..0000000000
--- a/recipes-devtools/ocaml/ocaml-camomile_0.8.1.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-inherit findlib
-SRC_URI[md5sum] = "999fc48a71030a1e765b85e3c1e7b933"
-SRC_URI[sha256sum] = "ca3c50f5442fce0ec9a9d35bfa99ab78084a2b5b02638c6e95f38340f9f104e5"
-DESCRIPTION = "Camomile, unicode library for OCAML"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
-
-DEPENDS = "ocaml-cross ocaml-findlib-cross"
-
-PR = "r0"
-
-SRC_URI = "http://downloads.sourceforge.net/project/camomile/camomile/0.8.1/camomile-0.8.1.tar.bz2 \
-           file://ocaml-camomile-destdir.patch;patch=1 \
-"
-#
-
-S = "${WORKDIR}/camomile-${PV}"
-
-FILES_${PN} = "${ocamllibdir}/camomile/*${SOLIBS}   \
-               /usr/share/camomile/charmaps/*       \
-               /usr/share/camomile/database/*       \
-               /usr/share/camomile/locales/*        \
-               /usr/share/camomile/mappings/*       \
-               "
-FILES_${PN}-dev = "${ocamllibdir}/camomile/*${SOLIBSDEV}    \
-                   ${ocamllibdir}/camomile/*.cm*            \
-                   ${ocamllibdir}/camomile/META             \
-                   "
-FILES_${PN}-staticdev = "${ocamllibdir}/camomile"
-FILES_${PN}-dbg = "${ocamllibdir}/camomile/.debug/*"
-
-do_configure() {
-    ./configure --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --datadir=${datadir}
-}
-
-do_compile() {
-    make \
-        OCAMLC="ocamlc -cc '${CC}'" \
-        OCAMLOPT="ocamlopt -cc '${CC}'"
-}
-
-do_install() {
-    make install DESTDIR="${D}"
-}
-
-#do_stage() {
-#    make install
-#}
diff --git a/recipes-devtools/ocaml/ocaml-cross/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/recipes-devtools/ocaml/ocaml-cross/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
deleted file mode 100644
index fa7664cecc..0000000000
--- a/recipes-devtools/ocaml/ocaml-cross/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 8 Mar 2011 21:17:40 +0100
-Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5237
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
-Authors: Eric Cooper, spiralvoice
-Reviewed-by: Stéphane Glondu <steph@glondu.net>
----
- asmcomp/amd64/emit.mlp |   13 +++++++------
- asmcomp/i386/emit.mlp  |    6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 4a3f844..525c6e6 100644
---- a/asmcomp/amd64/emit.mlp
-+++ b/asmcomp/amd64/emit.mlp
-@@ -679,17 +679,18 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
-+  begin match Config.system with
-+    "linux" | "gnu" ->
-+      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-+      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
-+    | _ -> ()
-+  end;
-   if !float_constants <> [] then begin
-     if macosx
-     then `	.literal8\n`
-     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
-     List.iter emit_float_constant !float_constants
--  end;
--  match Config.system with
--    "linux" | "gnu" ->
--      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
--      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  end
- 
- (* Emission of data *)
- 
-diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 2992f29..0b1252c 100644
---- a/asmcomp/i386/emit.mlp
-+++ b/asmcomp/i386/emit.mlp
-@@ -905,12 +905,12 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
--  List.iter emit_float_constant !float_constants;
--  match Config.system with
-+  begin match Config.system with
-     "linux_elf" | "bsd_elf" | "gnu" ->
-       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  | _ -> () end;
-+  List.iter emit_float_constant !float_constants
- 
- 
- (* Emission of data *)
--- 
diff --git a/recipes-devtools/ocaml/ocaml-cross/config.patch b/recipes-devtools/ocaml/ocaml-cross/config.patch
deleted file mode 100644
index 70e7d1e501..0000000000
--- a/recipes-devtools/ocaml/ocaml-cross/config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/configure b/configure
-index aa514f1..3d6a9c6 100755
---- a/configure
-+++ b/configure
-@@ -75,6 +75,8 @@ while : ; do
-         host_type=$2; shift;;
-     -cc*)
-         ccoption="$2"; shift;;
-+    -mksharedlib)
-+	mksharedliboption="$2"; shift;;
-     -as)
-         asoption="$2"; shift;;
-     -aspp)
-@@ -514,10 +516,15 @@ if test $withsharedlibs = "yes"; then
-     *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
-       cmxs="cmxs"
-       sharedcccompopts="-fPIC"
--      mksharedlib="$bytecc -shared"
-+      if [[ -z $mksharedliboption ]]; then
-+	  mksharedlib="$bytecc -shared"
-+	  mksharedlibrpath="-Wl,-rpath-link,"
-+      else
-+	  mksharedlib="$mksharedliboption"
-+	  mksharedlibrpath="-rpath "
-+      fi
-       bytecclinkopts="$bytecclinkopts -Wl,-E"
-       byteccrpath="-Wl,-rpath,"
--      mksharedlibrpath="-Wl,-rpath,"
-       natdynlinkopts="-Wl,-E"
-       shared_libraries_supported=true;;
-     alpha*-*-osf*)
diff --git a/recipes-devtools/ocaml/ocaml-cross/finaliser-on-weak-array-gives-dangling-pointers.patch b/recipes-devtools/ocaml/ocaml-cross/finaliser-on-weak-array-gives-dangling-pointers.patch
deleted file mode 100644
index 1a5bc29112..0000000000
--- a/recipes-devtools/ocaml/ocaml-cross/finaliser-on-weak-array-gives-dangling-pointers.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit fe137eedb508d4acaad6a0be4dbb2ec8e432af5d
-Author: Damien Doligez <damien.doligez-inria.fr>
-Date:   Thu Jun 21 14:30:11 2012 +0000
-
-    PR#5233: finaliser on weak array gives dangling pointers (crash)
-    
-    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12627 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-
-diff --git a/byterun/major_gc.c b/byterun/major_gc.c
-index aeb192f..1d290a5 100644
---- a/byterun/major_gc.c
-+++ b/byterun/major_gc.c
-@@ -233,7 +233,11 @@ static void mark_slice (intnat work)
-           weak_prev = &Field (cur, 0);
-           work -= Whsize_hd (hd);
-         }else{
--          /* Subphase_weak1 is done.  Start removing dead weak arrays. */
-+          /* Subphase_weak1 is done.
-+             Handle finalised values and start removing dead weak arrays. */
-+          gray_vals_cur = gray_vals_ptr;
-+          caml_final_update ();
-+          gray_vals_ptr = gray_vals_cur;
-           caml_gc_subphase = Subphase_weak2;
-           weak_prev = &caml_weak_list_head;
-         }
-@@ -254,10 +258,7 @@ static void mark_slice (intnat work)
-           }
-           work -= 1;
-         }else{
--          /* Subphase_weak2 is done.  Handle finalised values. */
--          gray_vals_cur = gray_vals_ptr;
--          caml_final_update ();
--          gray_vals_ptr = gray_vals_cur;
-+          /* Subphase_weak2 is done.  Go to Subphase_final. */
-           caml_gc_subphase = Subphase_final;
-         }
-       }
diff --git a/recipes-devtools/ocaml/ocaml-cross/remove-absolute-linker-path-from-lib.patch b/recipes-devtools/ocaml/ocaml-cross/remove-absolute-linker-path-from-lib.patch
deleted file mode 100644
index 01d195ed8f..0000000000
--- a/recipes-devtools/ocaml/ocaml-cross/remove-absolute-linker-path-from-lib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################
-SHORT DESCRIPTION
-###############################################################################
-Source: http://caml.inria.fr/mantis/view.php?id=5943
-
-###############################################################################
-LONG DESCRIPTION
-###############################################################################
-Link time paths should not be added to the RPATH (run-time-path) of the dynamic
-object built in most cases. With OE, it ends up having RPATH with build-machine
-absolute path (-L) in it, which is very wrong.
-
-This patch adds -elfmode option, to have the default ELF linker behaviour: not
-include the link-time search path to the RPATH.
-
-###############################################################################
-PATCHES
-###############################################################################
-Index: git/tools/ocamlmklib.mlp
-===================================================================
---- git.orig/tools/ocamlmklib.mlp	2016-02-24 15:37:58.557488630 +0100
-+++ git/tools/ocamlmklib.mlp	2016-02-24 15:40:52.268754425 +0100
-@@ -21,6 +21,7 @@
- and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
- and caml_opts = ref []      (* -ccopt to pass to ocamlc, ocamlopt *)
- and dynlink = ref supports_shared_libraries
-+and elfmode = ref false     (* do not add C link lib path to run-time path *)
- and failsafe = ref false    (* whether to fall back on static build only *)
- and c_libs = ref []         (* libs to pass to mksharedlib and ocamlc -cclib *)
- and c_opts = ref []      (* options to pass to mksharedlib and ocamlc -ccopt *)
-@@ -84,8 +85,9 @@
-       c_libs := s :: !c_libs
-     else if starts_with s "-L" then
-      (c_opts := s :: !c_opts;
--      let l = chop_prefix s "-L" in
--      if not (Filename.is_relative l) then rpath := l :: !rpath)
-+      if not !elfmode then
-+      (let l = chop_prefix s "-L" in
-+       if not (Filename.is_relative l) then rpath := l :: !rpath))
-     else if s = "-ocamlc" then
-       ocamlc := next_arg ()
-     else if s = "-ocamlopt" then
-@@ -96,6 +98,8 @@
-       output_c := next_arg()
-     else if s = "-dllpath" || s = "-R" || s = "-rpath" then
-       rpath := next_arg() :: !rpath
-+    else if s = "-elfmode" then
-+      elfmode := true
-     else if starts_with s "-R" then
-       rpath := chop_prefix s "-R" :: !rpath
-     else if s = "-Wl,-rpath" then
-@@ -136,6 +140,7 @@
-   -ccopt <opt>   C option passed to ocamlc -a or ocamlopt -a only
-   -custom        disable dynamic loading
-   -dllpath <dir> Add <dir> to the run-time search path for DLLs
-+  -elfmode       Do not add link-time search path to run-time path
-   -F<dir>        Specify a framework directory (MacOSX)
-   -framework <name>    Use framework <name> (MacOSX)
-   -help          Print this help message and exit
diff --git a/recipes-devtools/ocaml/ocaml-cross_git.bb b/recipes-devtools/ocaml/ocaml-cross_git.bb
deleted file mode 100644
index c2530b2d54..0000000000
--- a/recipes-devtools/ocaml/ocaml-cross_git.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-SECTION = "devel"
-LICENSE = "QPL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=524443efef4a3e092cca058d99996c88"
-
-PR = "r2"
-
-PV = "0+git${SRCPV}"
-
-SRCREV = "${AUTOREV}"
-SRC_URI = "git://${OPENXT_GIT_MIRROR}/ocaml.git;protocol=${OPENXT_GIT_PROTOCOL};branch=${OPENXT_BRANCH} \
-           file://0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch;patch=1 \
-	   file://config.patch \
-           file://remove-absolute-linker-path-from-lib.patch \
-           file://finaliser-on-weak-array-gives-dangling-pointers.patch \
-"
-
-inherit xenclient
-#inherit native
-inherit cross
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/ocaml-cross:"
-
-S = "${WORKDIR}/git"
-
-RDEPENDS_${PN}-dev = ""
-
-do_configure() {
-#	linux32 ./configure -no-curses -prefix ${STAGING_DIR} \
-#		-bindir ${STAGING_BINDIR} -libdir ${STAGING_LIBDIR} \
-#	        -no-tk -cc "$CC -m32" -as "$AS --32" -aspp "$CC -m32 -c"
-#	Ugly fix to cross-compile. I think we need to use cross-compil patch
-#	for ocaml
-	CFLAGS="${BUILD_CFLAGS} -m32" \
-		linux32 ./configure -no-curses \
-	        	-bindir ${bindir} \
-			-libdir ${libdir}/ocaml \
-			-mandir ${datadir}/man \
-            -cc "${TARGET_PREFIX}gcc -m32 --sysroot=${STAGING_DIR_TARGET}" -mksharedlib "${TARGET_PREFIX}ld -shared" \
-			-no-tk -as "${TARGET_PREFIX}as --32" -aspp "${TARGET_PREFIX}gcc -m32 -c"
-
-	sed -i'' -re 's/-lX11//' config/Makefile
-	sed -i'' -re 's/OTHERLIBRARIES=.*/OTHERLIBRARIES=unix str num dynlink bigarray systhreads threads/' config/Makefile
-	sed -i'' -re 's/NATIVECCCOMPOPTS=(.*)/NATIVECCCOMPOPTS=\1 -fno-stack-protector/' config/Makefile
-	sed -i'' -re 's/BYTECCCOMPOPTS=(.*)/BYTECCCOMPOPTS=\1 -fno-stack-protector/' config/Makefile
-}
-
-do_compile() {
-	oe_runmake world
-	mkdir -p ${WORKDIR}/targetcc
-	ln -sf ${CROSS_DIR}/bin/${HOST_PREFIX}gcc ${WORKDIR}/targetcc/gcc
-	make opt PATH="${WORKDIR}/targetcc:${PATH}"
-}
-
-#do_stage() {
-#	make install
-#	mv -v ${STAGING_LIBDIR}/ocaml/caml ${STAGING_INCDIR}/
-#}
-
-do_install() {
-	make PREFIX="${D}/${prefix}" BINDIR="${D}/${bindir}" LIBDIR="${D}/${libdir}/ocaml" MANDIR="${D}/${datadir}/man" install
-}
-
-do_package[noexec] = "1"
-do_package_write_ipk[noexec] = "1"
-do_package_write_rpm[noexec] = "1"
-do_package_write_deb[noexec] = "1"
-
diff --git a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-error-name-lookup.patch b/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-error-name-lookup.patch
deleted file mode 100644
index f66a0c9a50..0000000000
--- a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-error-name-lookup.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/dbus_stubs.c b/dbus_stubs.c
-index 8500f38..c4d0745 100644
---- a/dbus_stubs.c
-+++ b/dbus_stubs.c
-@@ -918,8 +918,13 @@ value stub_dbus_message_get_error_name(value message)
- 	if (!errname)
- 		error_name = Val_none;
- 	else {
-+            
- 		int index = find_index_string(errname, __error_table);
--		caml_alloc_some(error_name, Val_int(index));
-+                if (index >= 0) {
-+                    caml_alloc_some(error_name, Val_int(index));
-+                } else {
-+                    error_name = Val_none;
-+                }
- 	}
- 	CAMLreturn(error_name);
- }
diff --git a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-incorrect-dispatch-statuses.patch b/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-incorrect-dispatch-statuses.patch
deleted file mode 100644
index a3002f1264..0000000000
--- a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-incorrect-dispatch-statuses.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dbus_stubs.c b/dbus_stubs.c
-index ae3f208..8500f38 100644
---- a/dbus_stubs.c
-+++ b/dbus_stubs.c
-@@ -573,7 +573,7 @@ value stub_dbus_connection_dispatch(value bus)
- 	DBusDispatchStatus status;
- 
- 	status = dbus_connection_dispatch(DBusConnection_val(bus));
--	caml_alloc_variant(ret, Val_int(find_index_equal(status, __dispatch_status_table)));
-+	caml_alloc_variant(ret, find_index_equal(status, __dispatch_status_table));
- 	CAMLreturn(ret);
- }
- 
-@@ -584,7 +584,7 @@ value stub_dbus_connection_get_dispatch_status(value bus)
- 	DBusDispatchStatus status;
- 
- 	status = dbus_connection_get_dispatch_status(DBusConnection_val(bus));
--	caml_alloc_variant(ret, Val_int(find_index_equal(status, __dispatch_status_table)));
-+	caml_alloc_variant(ret, find_index_equal(status, __dispatch_status_table));
- 	CAMLreturn(ret);
- }
- 
diff --git a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-invalid-characters-in-byte-access.patch b/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-invalid-characters-in-byte-access.patch
deleted file mode 100644
index f483e8bfed..0000000000
--- a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-invalid-characters-in-byte-access.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dbus_stubs.c b/dbus_stubs.c
-index e4de1f1..ae3f208 100644
---- a/dbus_stubs.c
-+++ b/dbus_stubs.c
-@@ -1273,7 +1273,7 @@ static value message_get_basic(DBusMessageIter *iter, int c_type)
- 	DEBUG_GET("basic: %c (%d)\n", c_type, c_type);
- 	switch (c_type) {
- 	case DBUS_TYPE_BYTE: {
--		char c;
-+		int c;
- 		dbus_message_iter_get_basic(iter, &c);
- 		v = Val_int(c);
- 		break;
diff --git a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-memleak.patch b/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-memleak.patch
deleted file mode 100644
index fb21113d7e..0000000000
--- a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-memleak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dbus_stubs.c b/dbus_stubs.c
-index c4d0745..9cacb77 100644
---- a/dbus_stubs.c
-+++ b/dbus_stubs.c
-@@ -1042,7 +1042,7 @@ static void message_append_basic(DBusMessageIter *iter, int c_type, value v)
- 		}
- 	case DBUS_TYPE_OBJECT_PATH:
- 	case DBUS_TYPE_STRING: {
--		char *s = strdup(String_val(v));
-+		char *s = String_val(v);
- 		dbus_message_iter_append_basic(iter, c_type, &s);
- 		break;
- 		}
diff --git a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-multithread.patch b/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-multithread.patch
deleted file mode 100644
index 8c6c928e49..0000000000
--- a/recipes-devtools/ocaml/ocaml-dbus-0.24/fix-multithread.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/dbus_stubs.c b/dbus_stubs.c
-index 9cacb77..d1059d5 100644
---- a/dbus_stubs.c
-+++ b/dbus_stubs.c
-@@ -275,6 +275,15 @@ static void raise_dbus_type_not_supported(char *s)
- 	caml_raise_with_string(*dbus_err, s);
- }
- 
-+static void init_dbus(void)
-+{
-+        static int done = 0;
-+        if (!done) {
-+                dbus_threads_init_default();
-+                done = 1;
-+        }
-+}
-+
- /******************** BUS **********************/
- value stub_dbus_bus_get(value type)
- {
-@@ -283,6 +292,7 @@ value stub_dbus_bus_get(value type)
- 	DBusConnection *c_con;
- 	DBusError error;
- 
-+        init_dbus();
- 	dbus_error_init(&error);
- 	c_con = dbus_bus_get(__bustype_table[Int_val(type)], &error);
- 	if (!c_con)
-@@ -299,6 +309,7 @@ value stub_dbus_bus_get_private(value type)
- 	DBusConnection *c_con;
- 	DBusError error;
- 
-+        init_dbus();
- 	dbus_error_init(&error);
- 	c_con = dbus_bus_get_private(__bustype_table[Int_val(type)], &error);
- 	if (!c_con)
diff --git a/recipes-devtools/ocaml/ocaml-dbus_0.24.bb b/recipes-devtools/ocaml/ocaml-dbus_0.24.bb
deleted file mode 100644
index 65b014f638..0000000000
--- a/recipes-devtools/ocaml/ocaml-dbus_0.24.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-inherit findlib pkgconfig
-SRC_URI[md5sum] = "b769af9141a5c073056ed46ef76ba5be"
-SRC_URI[sha256sum] = "7c793987668e4236c63857469d2abe4a460e0b0954aa7d3262c6d9bb3c24bfdd"
-DESCRIPTION = "OCaml DBUS bindings"
-DEPENDS = "ocaml-cross ocaml-findlib-cross dbus"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f89276652d4738435c98d27fee7c6c7f"
-
-PR = "r5"
-
-S = "${WORKDIR}/ocaml_dbus-${PV}"
-
-SRC_URI = "http://projects.snarc.org/ocaml-dbus/download/ocaml_dbus-${PV}.tar.bz2 \
-           file://fix-invalid-characters-in-byte-access.patch;patch=1 \
-           file://fix-incorrect-dispatch-statuses.patch;patch=1 \
-           file://fix-error-name-lookup.patch;patch=1 \
-	   file://fix-memleak.patch;patch=1 \
-	   file://fix-multithread.patch;patch=1 \
-"
-
-PARALLEL_MAKE = ""
-
-FILES_${PN} = "${ocamllibdir}/dbus/*${SOLIBS} \
-               "
-FILES_${PN}-dev = "${ocamllibdir}/dbus/*${SOLIBSDEV}  \
-                   ${ocamllibdir}/dbus/*.cm*          \
-                   ${ocamllibdir}/dbus/META           \
-                  "
-FILES_${PN}-staticdev = "${ocamllibdir}/dbus/*.a"
-FILES_${PN}-dbg = "${ocamllibdir}/dbus/.debug/*"
-
-do_compile() {
-	oe_runmake \
-		OCAMLC="ocamlc -cc '${CC} -fPIC'" \
-		OCAMLOPT="ocamlopt -cc '${CC} -fPIC'" \
-		OCAMLMKLIB="ocamlmklib -elfmode -L'${STAGING_DIR_TARGET}/lib' -L'${STAGING_DIR_TARGET}/usr/lib'"
-
-}
-
-do_install() {
-	mkdir -p ${D}${ocamllibdir}
-	ocamlfind install -destdir ${D}${ocamllibdir} dbus META dBus.cmxa dBus.cma dBus.cmi dlldbus_stubs.so dBus.a libdbus_stubs.a
-}
-
-#do_stage() {
-#	ocamlfind install dbus META dBus.cmxa dBus.cma dBus.cmi dlldbus_stubs.so dBus.a libdbus_stubs.a
-#}
diff --git a/recipes-devtools/ocaml/ocaml-findlib-1.2.5/findlib_remote_utime.patch b/recipes-devtools/ocaml/ocaml-findlib-1.2.5/findlib_remote_utime.patch
deleted file mode 100644
index 6698e57c0a..0000000000
--- a/recipes-devtools/ocaml/ocaml-findlib-1.2.5/findlib_remote_utime.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/findlib/frontend.ml b/src/findlib/frontend.ml
-index 1788342..8174664 100644
---- a/src/findlib/frontend.ml
-+++ b/src/findlib/frontend.ml
-@@ -1441,7 +1441,6 @@ let copy_file ?(rename = (fun name -> name)) ?(append = "") src dstdir =
-       output_string ch_out append;
-       close_out ch_out;
-       close_in ch_in;
--      Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime;
- 
-       prerr_endline("Installed " ^ outpath);
-     with
diff --git a/recipes-devtools/ocaml/ocaml-findlib-config/findlib.conf b/recipes-devtools/ocaml/ocaml-findlib-config/findlib.conf
deleted file mode 100644
index df9959de8e..0000000000
--- a/recipes-devtools/ocaml/ocaml-findlib-config/findlib.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-destdir="DESTDIR"
-path="PATH"
diff --git a/recipes-devtools/ocaml/ocaml-findlib-config_0.1.bb b/recipes-devtools/ocaml/ocaml-findlib-config_0.1.bb
deleted file mode 100644
index 73892faed5..0000000000
--- a/recipes-devtools/ocaml/ocaml-findlib-config_0.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r0"
-
-SRC_URI = "file://findlib.conf"
-S = "${WORKDIR}"
-
-
-do_configure() {
-}
-
-do_compile() {
-}
-
-do_install() {
-	install -d "${D}/${sysconfdir}"
-	install findlib.conf "${D}/${sysconfdir}"
-}
-
-sysroot_stage_all_append() {
-    sysroot_stage_dir "${D}/${sysconfdir}" "${SYSROOT_DESTDIR}/${sysconfdir}"
-}
-
-
-sysroot_replace_config_paths() {
-	sed -i -e "s#DESTDIR#${ocamllibdir}#" "${SYSROOT_DESTDIR}${sysconfdir}/findlib.conf"
-	sed -i -e "s#PATH#${OCAML_STDLIBDIR}:${STAGING_LIBDIR_OCAML}#" "${SYSROOT_DESTDIR}/${sysconfdir}/findlib.conf"
-}
-
-SYSROOT_PREPROCESS_FUNCS += "sysroot_replace_config_paths"
diff --git a/recipes-devtools/ocaml/ocaml-findlib-cross_1.2.5.bb b/recipes-devtools/ocaml/ocaml-findlib-cross_1.2.5.bb
deleted file mode 100644
index fe89cf0e5d..0000000000
--- a/recipes-devtools/ocaml/ocaml-findlib-cross_1.2.5.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SRC_URI[md5sum] = "db12a92903c2869bb89e1a6446db269e"
-SRC_URI[sha256sum] = "9e1cf8ca3aa82329e1004612dae3060b2e24d4610c439d23575f72c88ddea868"
-DESCRIPTION = "findlib"
-DEPENDS = "ocaml-cross"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a30ace4f9508a47d2c25c45c48af6492"
-
-inherit cross
-
-PR = "r0"
-
-SRC_URI = "http://download.camlcity.org/download/findlib-${PV}.tar.gz \
-           file://findlib_remote_utime.patch;patch=1"
-
-S = "${WORKDIR}/findlib-${PV}"
-
-RDEPENDS_${PN}-dev = ""
-
-do_configure() {
-	./configure -bindir ${bindir} -mandir ${datadir}/man -config /non/existant/config.conf 
-}
-
-do_compile() {
-	oe_runmake all
-	oe_runmake opt
-}
-
-do_install() {
-	oe_runmake prefix=${D} install
-}
-
-#do_stage() {
-#	oe_runmake prefix=/ install
-#}