diff --git a/Makefile.am b/Makefile.am
index a0377c4..878272d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,5 +2,3 @@ SUBDIRS = webrtc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = webrtc-audio-processing.pc
-
-EXTRA_DIST = PATENTS
diff --git a/webrtc/Makefile.am b/webrtc/Makefile.am
index 4088784..a5d17bc 100644
--- a/webrtc/Makefile.am
+++ b/webrtc/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = base common_audio system_wrappers modules
 
 noinst_HEADERS = common.h
+
+EXTRA_DIST = BUILD.gn PATENTS LICENSE_THIRD_PARTY
diff --git a/webrtc/base/Makefile.am b/webrtc/base/Makefile.am
index f0307e5..3a88183 100644
--- a/webrtc/base/Makefile.am
+++ b/webrtc/base/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES = libbase.la
 
 noinst_HEADERS = arraysize.h \
+		 atomicops.h \
 		 basictypes.h \
 		 checks.h \
 		 constructormagic.h \
@@ -25,3 +26,5 @@ libbase_la_SOURCES = criticalsection.cc \
 		     thread_checker_impl.h
 
 libbase_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
+
+EXTRA_DIST = BUILD.gn
diff --git a/webrtc/common_audio/Makefile.am b/webrtc/common_audio/Makefile.am
index c7dc373..8dff0f7 100644
--- a/webrtc/common_audio/Makefile.am
+++ b/webrtc/common_audio/Makefile.am
@@ -1,7 +1,8 @@
 noinst_LTLIBRARIES = libcommon_audio.la
 
-libcommon_audio_la_SOURCES = \
-			     resampler/include/push_resampler.h \
+noinst_HEADERS = include/audio_util.h
+
+libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \
 			     resampler/include/resampler.h \
 			     resampler/push_sinc_resampler.h \
 			     resampler/sinc_resampler.h \
@@ -99,6 +100,8 @@ libcommon_audio_la_SOURCES = \
 libcommon_audio_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS)
 libcommon_audio_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
 
+EXTRA_DIST = BUILD.gn
+
 # FIXME:
 # x86  - resampler/sinc_resampler_sse.cc
 #        fir_filter_sse.cc
diff --git a/webrtc/modules/audio_coding/Makefile.am b/webrtc/modules/audio_coding/Makefile.am
index 7b726d2..29269ae 100644
--- a/webrtc/modules/audio_coding/Makefile.am
+++ b/webrtc/modules/audio_coding/Makefile.am
@@ -33,3 +33,5 @@ libaudio_coding_la_SOURCES = codecs/isac/main/interface/isac.h \
 
 libaudio_coding_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS)
 libaudio_coding_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
+
+EXTRA_DIST = BUILD.gn
diff --git a/webrtc/modules/audio_processing/Makefile.am b/webrtc/modules/audio_processing/Makefile.am
index a39fd68..bf7f3d0 100644
--- a/webrtc/modules/audio_processing/Makefile.am
+++ b/webrtc/modules/audio_processing/Makefile.am
@@ -153,6 +153,8 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/base/libbase.la \
 				       $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la
 libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO)
 
+EXTRA_DIST = BUILD.gn
+
 # FIXME:
 # x86:  aec/aec_core_sse2.c
 # 	aec/aec_rdft_sse2.c
diff --git a/webrtc/system_wrappers/Makefile.am b/webrtc/system_wrappers/Makefile.am
index 2f999d7..4344da7 100644
--- a/webrtc/system_wrappers/Makefile.am
+++ b/webrtc/system_wrappers/Makefile.am
@@ -45,7 +45,8 @@ libsystem_wrappers_la_SOURCES += source/critical_section_posix.cc \
 				 source/trace_posix.cc
 libsystem_wrappers_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
 
-EXTRA_DIST = source/critical_section_win.cc \
+EXTRA_DIST = BUILD.gn \
+	     source/critical_section_win.cc \
 	     source/event_timer_win.cc \
 	     source/rw_lock_generic.cc \
 	     source/rw_lock_win.cc \