diff --git a/Makefile.am b/Makefile.am
index 2b48369..2fc4e5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,8 @@ M_CPPFLAGS = -DSYSTEM_LIBINIPARSER=@SYSTEM_LIBINIPARSER@
 
 bin_PROGRAMS = cava
 cava_SOURCES = cava.c input/common.c input/alsa.c input/fifo.c input/portaudio.c input/pulse.c \
-               input/sndio.c input/shmem.c
+               input/sndio.c input/shmem.c output/terminal_bcircle.c output/terminal_ncurses.c \
+               output/terminal_noncurses.c output/raw.c
 cava_LDFLAGS = -L/usr/local/lib -Wl,-rpath /usr/local/lib
 cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
            -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L
diff --git a/cava.c b/cava.c
index 97542d6..0f6d693 100644
--- a/cava.c
+++ b/cava.c
@@ -14,45 +14,34 @@
 #include <stdio.h>
 #include <termios.h>
 
-#include <fftw3.h>
-#include <sys/ioctl.h>
-#define max(a, b)                                                                                  \
-    ({                                                                                             \
-        __typeof__(a) _a = (a);                                                                    \
-        __typeof__(b) _b = (b);                                                                    \
-        _a > _b ? _a : _b;                                                                         \
-    })
 #include <ctype.h>
 #include <dirent.h>
+#include <fftw3.h>
 #include <getopt.h>
 #include <pthread.h>
 #include <signal.h>
 #include <string.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 
 #include "debug.h"
+#include "util.h"
 
-// We need to make sure that clang-format does not order the .h files before the .c files.
-// clang-format off
 #ifdef NCURSES
 #include "output/terminal_bcircle.h"
-#include "output/terminal_bcircle.c"
 #include "output/terminal_ncurses.h"
-#include "output/terminal_ncurses.c"
+#include <curses.h>
 #endif
 
-#include "output/terminal_noncurses.h"
-#include "output/terminal_noncurses.c"
-
 #include "output/raw.h"
-#include "output/raw.c"
+#include "output/terminal_noncurses.h"
 
+#include "input/alsa.h"
 #include "input/common.h"
 #include "input/fifo.h"
-#include "input/alsa.h"
 #include "input/portaudio.h"
 #include "input/pulse.h"
 #include "input/shmem.h"
@@ -60,6 +49,8 @@
 
 #include <iniparser.h>
 
+// We need to make sure that clang-format does not order the .h files before the .c files.
+// clang-format off
 #include "config.h"
 #include "config.c"
 // clang-format on
diff --git a/output/raw.c b/output/raw.c
index 02f0868..eaef8ee 100644
--- a/output/raw.c
+++ b/output/raw.c
@@ -1,5 +1,8 @@
+#include <math.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <unistd.h>
+
 int16_t buf_16;
 int8_t buf_8;
 
diff --git a/output/terminal_bcircle.c b/output/terminal_bcircle.c
index efe1ea3..302a9e6 100644
--- a/output/terminal_bcircle.c
+++ b/output/terminal_bcircle.c
@@ -1,3 +1,7 @@
+#ifdef NCURSES
+
+#include "output/terminal_bcircle.h"
+
 #include <curses.h>
 #include <locale.h>
 #include <math.h>
@@ -81,3 +85,5 @@ void cleanup_terminal_bcircle(void) {
     endwin();
     system("clear");
 }
+
+#endif // NCURSES
diff --git a/output/terminal_bcircle.h b/output/terminal_bcircle.h
index 674deaf..87bbe0f 100644
--- a/output/terminal_bcircle.h
+++ b/output/terminal_bcircle.h
@@ -1,3 +1,4 @@
+#pragma once
 
 int init_terminal_bcircle(int col, int bgcol);
 void get_terminal_dim_bcircle(int *w, int *h);
diff --git a/output/terminal_ncurses.c b/output/terminal_ncurses.c
index 5f8ef3f..d20befe 100644
--- a/output/terminal_ncurses.c
+++ b/output/terminal_ncurses.c
@@ -1,7 +1,14 @@
+#ifdef NCURSES
+
+#include "output/terminal_ncurses.h"
+
 #include <curses.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wchar.h>
 
+#include "util.h"
+
 int gradient_size = 64;
 
 struct colors {
@@ -269,3 +276,5 @@ void cleanup_terminal_ncurses(void) {
     system("clear");
     system("reset");
 }
+
+#endif // NCURSES
diff --git a/output/terminal_noncurses.c b/output/terminal_noncurses.c
index 02f30ca..bb6cdcf 100644
--- a/output/terminal_noncurses.c
+++ b/output/terminal_noncurses.c
@@ -1,6 +1,9 @@
 #include <locale.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
diff --git a/util.h b/util.h
new file mode 100644
index 0000000..6deb36e
--- /dev/null
+++ b/util.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define max(a, b)                                                                                  \
+    ({                                                                                             \
+        __typeof__(a) _a = (a);                                                                    \
+        __typeof__(b) _b = (b);                                                                    \
+        _a > _b ? _a : _b;                                                                         \
+    })