diff --git a/ffmpeg.c b/ffmpeg.c
index b9ae4cae0c133d66d4d70cd363296f3dba0f3729..88ef7985a3a14ebcd26fb3110fbdf729b47787a4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -79,7 +79,7 @@
 
 #include "cmdutils.h"
 
-#include "libavutil/assert.h"
+#include "libavutil/avassert.h"
 
 const char program_name[] = "FFmpeg";
 const int program_birth_year = 2000;
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 3f13092c3c8d5b2a902a20531210fcee79bc5c82..b0d0de88a7938528b9df19cbd5799239660df4de 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -3,8 +3,8 @@ include $(SUBDIR)../config.mak
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
-          assert.h                                                      \
           attributes.h                                                  \
+          avassert.h                                                    \
           avstring.h                                                    \
           avutil.h                                                      \
           base64.h                                                      \
diff --git a/libavutil/assert.h b/libavutil/avassert.h
similarity index 97%
rename from libavutil/assert.h
rename to libavutil/avassert.h
index cf76912564cef4f35abca247f969dcbd38227e81..fe307fa8945393a3d5301ae6ea2b09f8c502819b 100644
--- a/libavutil/assert.h
+++ b/libavutil/avassert.h
@@ -24,8 +24,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVUTIL_ASSERT_H
-#define AVUTIL_ASSERT_H
+#ifndef AVUTIL_AVASSERT_H
+#define AVUTIL_AVASSERT_H
 
 #include "avutil.h"
 #include "log.h"
diff --git a/libavutil/rational.c b/libavutil/rational.c
index 4e3c50be810aae49342512b0cd62fec9ca08caf6..0e0571e136db50e72888e8c5780251a165845549 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -25,7 +25,7 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "assert.h"
+#include "avassert.h"
 //#include <math.h>
 #include <limits.h>