diff --git a/gui/audio.c b/gui/audio.c
index 7c27b942..5deec1b5 100644
--- a/gui/audio.c
+++ b/gui/audio.c
@@ -1,8 +1,6 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/audio.h>
-#include <core/playlist.h>
 #include <core/string.h>
 #include <gui/artwork.h>
 #include <gui/audio.h>
diff --git a/gui/model.c b/gui/model.c
index 28ae6d51..734c60eb 100644
--- a/gui/model.c
+++ b/gui/model.c
@@ -2,7 +2,6 @@
  * Copyright 2016 (c) Anna Schumaker.
  */
 #include <core/audio.h>
-#include <core/playlist.h>
 #include <core/string.h>
 #include <gui/builder.h>
 #include <gui/model.h>
diff --git a/include/gui/artwork.h b/include/gui/artwork.h
index 7835c65b..a773c947 100644
--- a/include/gui/artwork.h
+++ b/include/gui/artwork.h
@@ -3,6 +3,7 @@
  */
 #ifndef OCARINA_GUI_ARTWORK_H
 #define OCARINA_GUI_ARTWORK_H
+#include <core/tags/track.h>
 #include <gui/builder.h>
 
 /* Called to set artwork for a track. */
diff --git a/include/gui/audio.h b/include/gui/audio.h
index 4c141955..c7fc2e91 100644
--- a/include/gui/audio.h
+++ b/include/gui/audio.h
@@ -3,6 +3,7 @@
  */
 #ifndef OCARINA_GUI_AUDIO_H
 #define OCARINA_GUI_AUDIO_H
+#include <core/audio.h>
 #include <gui/builder.h>
 
 /* Audio callback functions. */