diff --git a/src/connections.c b/src/connections.c
index c9d83a1..04a1b83 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -15,16 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
-#include <assert.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/socket.h>
 
 #include <util.h>
 #include <runner.h>
@@ -186,7 +179,8 @@ static int processChar(Connection *conn, char c, Sitefile *site) {
 			conn->currLineAlloc *= 2;
 			newline = realloc(conn->currLine,
 			                        conn->currLineAlloc);
-			assert(newline != NULL);
+			if (newline == NULL)
+				return 1;
 			conn->currLine = newline;
 		}
 		conn->currLine[conn->currLineLen++] = c;
diff --git a/src/main.c b/src/main.c
index b87eb26..17f0562 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,20 +16,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <stdio.h>
-#include <errno.h>
 #include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdint.h>
 #include <stdarg.h>
 
 #include <pwd.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 #include <util.h>
 #include <runner.h>
diff --git a/src/responses.c b/src/responses.c
index 377444c..5ab42ac 100644
--- a/src/responses.c
+++ b/src/responses.c
@@ -16,7 +16,6 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/responseutil.c b/src/responseutil.c
index 0fb1f81..c7682ef 100644
--- a/src/responseutil.c
+++ b/src/responseutil.c
@@ -15,15 +15,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <limits.h>
 
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include <responseutil.h>
 
diff --git a/src/runner.c b/src/runner.c
index a4370f1..52213cf 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -15,10 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <stdio.h>
-#include <errno.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/src/sockets.c b/src/sockets.c
index 7a53b83..a29a0cd 100644
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <assert.h>