diff --git a/src/actions.cpp b/src/actions.cpp
index 84a5a138..3d198e1e 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -21,6 +21,7 @@
 #include <cassert>
 #include <cerrno>
 #include <cstring>
+#include <algorithm>
 #include <iostream>
 
 #include "actions.h"
@@ -1460,9 +1461,9 @@ bool EditDirectoryName::canBeRun() const
 #	ifdef HAVE_TAGLIB_H
 	    ||   (myScreen->ActiveWindow() == myTagEditor->Dirs
 	      && !myTagEditor->Dirs->empty()
-	      && myTagEditor->Dirs->choice() > 0))
+	      && myTagEditor->Dirs->choice() > 0)
 #	endif // HAVE_TAGLIB_H
-	;
+	);
 }
 
 void EditDirectoryName::Run()
diff --git a/src/browser.cpp b/src/browser.cpp
index ab3eb38e..9412ba38 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -30,6 +30,7 @@
 #include "global.h"
 #include "helpers.h"
 #include "playlist.h"
+#include "regex_filter.h"
 #include "settings.h"
 #include "status.h"
 #include "tag_editor.h"
diff --git a/src/display.cpp b/src/display.cpp
index 089d0fde..b7e6fa14 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -349,6 +349,7 @@ void Display::Songs(NC::Menu<MPD::Song> &menu, HasSongs *screen, const std::stri
 	showSongs(menu, menu.drawn()->value(), *screen, format);
 }
 
+#ifdef HAVE_TAGLIB_H
 void Display::Tags(NC::Menu<MPD::MutableSong> &menu)
 {
 	const MPD::MutableSong &s = menu.drawn()->value();
@@ -365,6 +366,7 @@ void Display::Tags(NC::Menu<MPD::MutableSong> &menu)
 			menu << s.getName() << Config.color2 << " -> " << NC::clEnd << s.getNewURI();
 	}
 }
+#endif // HAVE_TAGLIB_H
 
 void Display::Outputs(NC::Menu<MPD::Output> &menu)
 {
diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp
index 7e519a0e..655c742d 100644
--- a/src/playlist_editor.cpp
+++ b/src/playlist_editor.cpp
@@ -28,6 +28,7 @@
 #include "playlist.h"
 #include "playlist_editor.h"
 #include "mpdpp.h"
+#include "regex_filter.h"
 #include "status.h"
 #include "tag_editor.h"
 #include "utility/comparators.h"