diff --git a/src/control_socket.cpp b/src/control_socket.cpp
index 2c8856801..c8abcf91e 100644
--- a/src/control_socket.cpp
+++ b/src/control_socket.cpp
@@ -35,11 +35,8 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
 #include "config_unix.h"
 #include "config_win32.h"
-#endif // HAVE_CONFIG_H
 
 #include "control_socket.h"
 #include "compat/platform_pipe.h"
diff --git a/src/rtp/rtp_callback.c b/src/rtp/rtp_callback.c
index bbc45716c..8cd9982d4 100644
--- a/src/rtp/rtp_callback.c
+++ b/src/rtp/rtp_callback.c
@@ -55,30 +55,30 @@
  *
  */
 
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-
-#include <inttypes.h>
-#include <stdint.h>
-
-#include "debug.h"
-#include "host.h"
-#include "pdb.h"
-#include "video_display.h"
-#include "video_codec.h"
-#include "ntp.h"
-#include "tv.h"
-#include "rtp/rtp.h"
-#include "rtp/pbuf.h"
 #include "rtp/rtp_callback.h"
-#include "tfrc.h"
+
+#include <assert.h>      // for assert
+#include <inttypes.h>    // for uint32_t, PRIx32
+#include <stdio.h>       // for printf
+#include <stdlib.h>      // for free, NULL, calloc
+#include <string.h>      // for strncmp, strncpy
+
+#include "debug.h"       // for debug_msg, log_msg, LOG_LEVEL_INFO
+#include "ntp.h"         // for ntp64_time, ntp64_to_ntp32
+#include "pdb.h"         // for pdb_e, pdb_get, pdb_add, pdb_destroy_item
+#include "rtp/pbuf.h"    // for pbuf_insert
+#include "rtp/rtp.h"     // for rtp_my_ssrc, rtcp_rr, rtcp_app, rtcp_sdes_item
+#include "tfrc.h"        // for tfrc_recv_data
+#include "tv.h"          // for get_time_in_ns
+
+struct pdb;
+struct rtp;
 
 extern char *frame;
 
 char hdr_buf[100];
-struct msghdr msg;
-struct iovec iov[10];
+// struct msghdr msg;
+// struct iovec iov[10];
 
 extern uint32_t RTT;
 
diff --git a/src/rtp/rtpenc_h264.c b/src/rtp/rtpenc_h264.c
index 980b1538b..889c55c8f 100644
--- a/src/rtp/rtpenc_h264.c
+++ b/src/rtp/rtpenc_h264.c
@@ -44,19 +44,16 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif // HAVE_CONFIG_H
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include "debug.h"
-#include "rtp/rtpdec_h264.h"
 #include "rtp/rtpenc_h264.h"
 
+#include <stddef.h>           // for NULL
+#include <stdint.h>           // for uint32_t
+#include <stdio.h>            // for snprintf
+
+#include "debug.h"            // for debug_msg
+#include "rtp/rtpdec_h264.h"  // for nal_type, aux_nal_types, NALU_HDR_GET_TYPE
+
 static uint32_t get4Bytes(const unsigned char *ptr) {
         return (ptr[0] << 24) | (ptr[1] << 16) | (ptr[2] << 8) | ptr[3];
 }