diff --git a/ffplay.c b/ffplay.c
index 6536e02c78fdd19fd8a5368a10408ef3707d7dc4..2804cf6872089e954949e8cc4ead9163b2472d7d 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <limits.h>
 #include "avformat.h"
+#include "rtsp.h"
 #include "swscale.h"
 #include "avstring.h"
 
diff --git a/ffserver.c b/ffserver.c
index 94c565a0265da4072628cab57da16c9bae82b687..96b298795d8598d2f850421675c968e5f584155b 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "avformat.h"
+#include "rtsp.h"
+#include "rtp.h"
 
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4070e02ea36e5fab70c2ec1424ed251859d8edfc..4c72a617c39f2290cb40f96e5d53774549525e38 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -460,10 +460,6 @@ enum CodecID av_guess_image2_codec(const char *filename);
 /* XXX: use automatic init with either ELF sections or C file parser */
 /* modules */
 
-#include "rtp.h"
-
-#include "rtsp.h"
-
 /* utils.c */
 void av_register_input_format(AVInputFormat *format);
 void av_register_output_format(AVOutputFormat *format);
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index db11049002763f313824a4ff5ceb346a2e8eaf96..9ef7f1f80e33e3d1c41ecae8ba94f48d876ea34c 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -24,6 +24,7 @@
 #include <unistd.h> /* for select() prototype */
 #include "network.h"
 #include "avstring.h"
+#include "rtsp.h"
 
 #include "rtp_internal.h"