diff --git a/configure.ac b/configure.ac
index e28cb2180..e7caf35b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -898,7 +898,7 @@ dnl ##################################################
 dnl # Check for doxygen
 dnl ##################################################
 
-AC_PATH_PROG(DOXYGEN,doxygen,false)
+AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,false)
 AM_CONDITIONAL(HAVE_DOXYGEN, test "$DOXYGEN" != "false")
 
 
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 9a7819d8f..c21503d35 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef __linux
 #include <gdk/gdkx.h>
 #elif defined(WIN32)
-#include <gdk/gdk-win32.h>
+#include <gdk/gdkwin32.h>
 #elif defined(__APPLE__)
 extern void *gdk_quartz_window_get_nswindow(GdkWindow      *window);
 extern void *gdk_quartz_window_get_nsview(GdkWindow      *window);
diff --git a/mediastreamer2 b/mediastreamer2
index f6f1d4e98..dbded55e1 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f6f1d4e9804a9e3ba625621ccfaf562782642ff9
+Subproject commit dbded55e10f03f77edfff660f38cc0b41348cc79
diff --git a/oRTP b/oRTP
index 89ca6ec13..540ee49bd 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 89ca6ec136b325e4b51e40c6de6b7ab8b2d72432
+Subproject commit 540ee49bd3f65139f7e5938cc6bc1f8a4353c3f7