diff --git a/amarok/configure.in.in b/amarok/configure.in.in
index 04ab8411..e687dda7 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -995,7 +995,7 @@ if test "$have_mp4v2" != "no"; then
     ac_cppflags_save=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS -I."
     AC_CHECK_HEADERS(systems.h)
-    AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
+    AC_CHECK_HEADERS([mp4v2/mp4v2.h], [have_mp4_h=yes], [],
         [#ifdef HAVE_SYSTEMS_H
          # include <systems.h>
          #endif
diff --git a/amarok/src/metadata/mp4/mp4file.cpp b/amarok/src/metadata/mp4/mp4file.cpp
index 8664a20c..3019e37a 100644
--- a/amarok/src/metadata/mp4/mp4file.cpp
+++ b/amarok/src/metadata/mp4/mp4file.cpp
@@ -31,6 +31,8 @@ email                : aumuell@reserv.at
 
 #include <stdint.h>
 #include <cstdlib>
+#include <stdlib.h>
+#include <sys/types.h>
 
 #define MP4V2_HAS_WRITE_BUG 1
 
diff --git a/amarok/src/metadata/mp4/mp4properties.cpp b/amarok/src/metadata/mp4/mp4properties.cpp
index b1d8e8e4..fa93d94a 100644
--- a/amarok/src/metadata/mp4/mp4properties.cpp
+++ b/amarok/src/metadata/mp4/mp4properties.cpp
@@ -31,6 +31,7 @@ email                : andrew.leadbetter@gmail.com
 
 #include <stdint.h>
 #include <cstring>
+#include <sys/types.h>
 
 #ifndef UINT64_TO_DOUBLE
 #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
diff --git a/amarok/src/metadata/mp4/mp4properties.h b/amarok/src/metadata/mp4/mp4properties.h
index 472be659..95c83035 100644
--- a/amarok/src/metadata/mp4/mp4properties.h
+++ b/amarok/src/metadata/mp4/mp4properties.h
@@ -24,7 +24,7 @@ email                : andrew.leadbetter@gmail.com
 
 #include <audioproperties.h>
 #include <tstring.h>
-#include <mp4.h>
+#include <mp4v2/mp4v2.h>
 // mp4.h drags in mp4_config.h that defines these
 // get rid of them so they don't conflict with our config.h
 #undef VERSION
diff --git a/amarok/src/metadata/mp4/mp4tag.cpp b/amarok/src/metadata/mp4/mp4tag.cpp
index b493da42..ee032d3a 100644
--- a/amarok/src/metadata/mp4/mp4tag.cpp
+++ b/amarok/src/metadata/mp4/mp4tag.cpp
@@ -26,6 +26,8 @@ email                : andrew.leadbetter@gmail.com
 #include <stdint.h>
 #include <cstdlib>
 #include <cstring>
+#include <stdlib.h>
+#include <sys/types.h>
 
 using namespace TagLib;
 
diff --git a/amarok/src/metadata/mp4/mp4tag.h b/amarok/src/metadata/mp4/mp4tag.h
index 8cb1827a..9ba20bc0 100644
--- a/amarok/src/metadata/mp4/mp4tag.h
+++ b/amarok/src/metadata/mp4/mp4tag.h
@@ -23,7 +23,7 @@ email                : andrew.leadbetter@gmail.com
 
 #include <tag.h>
 #include "mp4file.h"
-#include <mp4.h>
+#include <mp4v2/mp4v2.h>
 
 namespace TagLib {