diff --git a/src/audio_call.c b/src/audio_call.c
index 5b5974691..3b6c9ae0b 100644
--- a/src/audio_call.c
+++ b/src/audio_call.c
@@ -39,7 +39,6 @@
 #include "video_call.h"
 #endif /* VIDEO */
 
-#include <assert.h>
 #include <curses.h>
 #include <pthread.h>
 #include <stdbool.h>
diff --git a/src/audio_device.c b/src/audio_device.c
index 679a3a6bd..442d20eb5 100644
--- a/src/audio_device.c
+++ b/src/audio_device.c
@@ -33,7 +33,6 @@
 #include <AL/alext.h>
 #endif /* ALC_ALL_DEVICES_SPECIFIER */
 
-#include <assert.h>
 #include <math.h>
 #include <pthread.h>
 #include <stdbool.h>
diff --git a/src/chat.c b/src/chat.c
index 42f616067..8af12b4c0 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -24,7 +24,6 @@
 #define _GNU_SOURCE    /* needed for wcswidth() */
 #endif
 
-#include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/conference.c b/src/conference.c
index 90700f38e..a2136a8fe 100644
--- a/src/conference.c
+++ b/src/conference.c
@@ -24,7 +24,6 @@
 #define _GNU_SOURCE    /* needed for strcasestr() and wcswidth() */
 #endif
 
-#include <assert.h>
 #include <inttypes.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/execute.c b/src/execute.c
index 3de45389a..bdf4b244a 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/friendlist.c b/src/friendlist.c
index 58bedc25f..339bebd12 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -21,7 +21,6 @@
  */
 
 #include <arpa/inet.h>
-#include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/game_base.c b/src/game_base.c
index b201f6f1e..6ff9d40ef 100644
--- a/src/game_base.c
+++ b/src/game_base.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -924,8 +923,6 @@ static ToxWindow *game_new_window(Tox *m, GameType type, uint32_t friendnumber)
 
         const size_t name_size = sizeof(ret->name);
 
-        assert(name_size != 0 && name_size <= sizeof(buf));
-
         buf[name_size - 1] = '\0';
 
         snprintf(ret->name, name_size, "%s", buf);
diff --git a/src/groupchats.c b/src/groupchats.c
index 55efb70ee..88f3b5fb9 100644
--- a/src/groupchats.c
+++ b/src/groupchats.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #include <time.h>
 #include <wchar.h>
 #include <unistd.h>
diff --git a/src/notify.c b/src/notify.c
index 8863ed166..8ca597cd3 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <assert.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/osx_video.m b/src/osx_video.m
index 457e905ff..1f5da2c18 100644
--- a/src/osx_video.m
+++ b/src/osx_video.m
@@ -36,7 +36,6 @@
 #include <pthread.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <assert.h>
 
 /*
  * Helper video format functions
diff --git a/src/video_call.c b/src/video_call.c
index 4cf5f4ca9..34196c83c 100644
--- a/src/video_call.c
+++ b/src/video_call.c
@@ -30,7 +30,6 @@
 #include "video_device.h"
 #include "windows.h"
 
-#include <assert.h>
 #include <curses.h>
 #include <pthread.h>
 #include <stdbool.h>