diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 48a74691..3eca1346 100644
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -18,7 +18,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 
 EXTRA_DIST = \
 	Makefile.lite \
diff --git a/src/share/replaygain_analysis/replaygain_analysis.c b/src/share/replaygain_analysis/replaygain_analysis.c
index 9b74b905..5a68a56a 100644
--- a/src/share/replaygain_analysis/replaygain_analysis.c
+++ b/src/share/replaygain_analysis/replaygain_analysis.c
@@ -102,7 +102,7 @@
 #include <stdint.h>
 #endif
 
-#include "replaygain_analysis.h"
+#include "share/replaygain_analysis.h"
 
 float_t ReplayGainReferenceLoudness = 89.0; /* in dB SPL */
 
diff --git a/src/share/replaygain_synthesis/replaygain_synthesis.c b/src/share/replaygain_synthesis/replaygain_synthesis.c
index b7fbfd3e..975879e4 100644
--- a/src/share/replaygain_synthesis/replaygain_synthesis.c
+++ b/src/share/replaygain_synthesis/replaygain_synthesis.c
@@ -41,7 +41,7 @@
 
 #include <string.h> /* for memset() */
 #include <math.h>
-#include "replaygain_synthesis.h"
+#include "share/replaygain_synthesis.h"
 #include "FLAC/assert.h"
 
 #define FLAC__I64L(x) x##LL
diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am
index cda7dc50..50226ca7 100644
--- a/src/share/utf8/Makefile.am
+++ b/src/share/utf8/Makefile.am
@@ -15,7 +15,7 @@
 #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
 #  distribution.
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES = libutf8.la
 
diff --git a/src/share/utf8/utf8.c b/src/share/utf8/utf8.c
index aef19726..fbac9323 100644
--- a/src/share/utf8/utf8.c
+++ b/src/share/utf8/utf8.c
@@ -32,7 +32,7 @@
 
 #include "share/alloc.h"
 #include "share/safe_str.h"
-#include "utf8.h"
+#include "share/utf8.h"
 #include "charset.h"