diff --git a/ffserver.c b/ffserver.c
index cfb1a6cad001888f18c95f3e54a558cc64bce57d..c16f8aa756f4e49ebedd7423d95c65130b05cbc2 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #include "libavformat/avformat.h"
 /* FIXME: those are internal headers, ffserver _really_ shouldn't use them */
-#include "libavformat/ffm.h"
 #include "libavformat/rtpproto.h"
 #include "libavformat/rtsp.h"
 #include "libavformat/avio_internal.h"
diff --git a/ffserver_config.c b/ffserver_config.c
index 0ec93b5fda27b1f9565d462b6609965c21f5a407..99709b54c70c1182c11f09622fd90e90bd46c439 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -25,9 +25,6 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/avassert.h"
 
-// FIXME those are internal headers, ffserver _really_ shouldn't use them
-#include "libavformat/ffm.h"
-
 #include "cmdutils.h"
 #include "ffserver_config.h"
 
diff --git a/ffserver_config.h b/ffserver_config.h
index 1b121946c1e587df21c88de07fb1d5a980108a0a..0bd4cfc762ea6123661dbd451a3d5a9d33c1c105 100644
--- a/ffserver_config.h
+++ b/ffserver_config.h
@@ -21,6 +21,8 @@
 #ifndef FFSERVER_CONFIG_H
 #define FFSERVER_CONFIG_H
 
+#define FFM_PACKET_SIZE 4096
+
 #include "libavutil/dict.h"
 #include "libavformat/avformat.h"
 #include "libavformat/network.h"