diff --git a/.gitignore b/.gitignore
index 8c5376d..ac6253a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,6 +181,7 @@
 /lib/hs/dist
 /lib/java/build
 /lib/js/test/build
+/lib/nodejs/coverage
 /lib/nodejs/node_modules/
 /lib/perl/MANIFEST
 /lib/perl/MYMETA.json
diff --git a/Makefile.am b/Makefile.am
index e6a965a..42c82e2 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,15 +87,22 @@
 	codespell --write-changes --skip=$(skipped_files) --disable-colors
 
 EXTRA_DIST = \
+	.clang-format \
+	.editorconfig \
 	.travis.yml \
+	appveyor.yml \
 	bower.json \
+	build \
+	CMakeLists.txt \
 	composer.json \
 	contrib \
 	CONTRIBUTING.md \
 	debian \
 	doc \
 	doap.rdf \
+	json-schema.json \
 	package.json \
+	rat_exclude \
 	sonar-project.properties \
 	LICENSE \
 	CHANGES \
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 485e30c..38f9f9d 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -41,6 +41,7 @@
                  src/logging.h \
                  src/md5.h \
                  src/audit/t_audit.cpp \
+                 src/audit/t_audit.h \
                  src/parse/t_doc.h \
                  src/parse/t_type.h \
                  src/parse/t_base_type.h \
@@ -110,6 +111,7 @@
              compiler.vcxproj.filters
 
 EXTRA_DIST = \
+             coding_standards.md \
              README.md \
              CMakeLists.txt \
              $(WINDOWS_DIST)
diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
index 58e7329..153d14b 100755
--- a/lib/c_glib/Makefile.am
+++ b/lib/c_glib/Makefile.am
@@ -88,6 +88,8 @@
 
 
 EXTRA_DIST = \
+             CMakeLists.txt \
+             coding_standards.md \
              README.md \
              test/glib.suppress \
              thrift_c_glib.pc.in
diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am
index 372be2e..7319743 100755
--- a/lib/c_glib/test/Makefile.am
+++ b/lib/c_glib/test/Makefile.am
@@ -275,3 +275,8 @@
     *.gcno                              \
     *.gcda                              \
     *.gcov
+
+EXTRA_DIST = \
+             CMakeLists.txt \
+             ContainerTest.thrift
+
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 4e5cde7..4742ee0 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -261,12 +261,15 @@
              3rdparty.props
 
 EXTRA_DIST = \
+             CMakeLists.txt \
+             coding_standards.md \
              README.md \
              thrift-nb.pc.in \
              thrift.pc.in \
              thrift-z.pc.in \
              thrift-qt.pc.in \
              thrift-qt5.pc.in \
+             src/thrift/qt/CMakeLists.txt \
              $(WINDOWS_DIST)
 
 style-local:
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index dadbe38..435f2b5 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -114,7 +114,9 @@
 	ToStringTest.cpp \
 	TypedefTest.cpp \
 	TServerSocketTest.cpp \
-	TServerTransportTest.cpp
+	TServerTransportTest.cpp \
+	TestPortFixture.h \
+	TTransportCheckThrow.h
 
 if !WITH_BOOSTTHREADS
 UnitTests_SOURCES += \
@@ -203,7 +205,8 @@
 # TPipedTransportTest
 #
 TPipedTransportTest_SOURCES = \
-	TPipedTransportTest.cpp
+	TPipedTransportTest.cpp \
+	TPipeInterruptTest.cpp
 
 TPipedTransportTest_LDADD = \
 	$(top_builddir)/lib/cpp/libthrift.la \
@@ -357,7 +360,10 @@
 	$(RM) -r gen-cpp
 
 EXTRA_DIST = \
-	ThriftTest_extras.cpp \
-	DebugProtoTest_extras.cpp \
 	concurrency \
-	processor
+	processor \
+	qt \
+	CMakeLists.txt \
+	DebugProtoTest_extras.cpp \
+	tests.xml \
+	ThriftTest_extras.cpp
diff --git a/lib/csharp/Makefile.am b/lib/csharp/Makefile.am
index 5ce4276..2e2d7fe 100644
--- a/lib/csharp/Makefile.am
+++ b/lib/csharp/Makefile.am
@@ -100,4 +100,5 @@
              src/Properties/AssemblyInfo.WP7.cs \
              src/Transport/TSilverlightSocket.cs \
              test \
+             coding_standards.md \
              README.md
diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am
index f48ff0a..f577a63 100644
--- a/lib/erl/Makefile.am
+++ b/lib/erl/Makefile.am
@@ -65,6 +65,7 @@
 EXTRA_DIST = \
 	include \
 	src \
+	coding_standards.md \
 	rebar \
 	rebar.config \
 	test \
diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index bf173ba..ff946ea 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -38,4 +38,5 @@
 
 EXTRA_DIST = \
 	thrift \
+	coding_standards.md \
 	README.md
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index 9d01723..e03d48b 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -81,6 +81,7 @@
 	$(GO) run TestClient.go
 
 EXTRA_DIST = \
+	dontexportrwtest \
 	tests \
 	BinaryKeyTest.thrift \
 	GoTagTest.thrift \
diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am
index 5b007fa..45529c7 100755
--- a/lib/hs/Makefile.am
+++ b/lib/hs/Makefile.am
@@ -18,6 +18,7 @@
 #
 
 EXTRA_DIST = \
+	coding_standards.md \
 	LICENSE \
 	README.md \
 	Setup.lhs \
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index 63d40a6..859f3f2 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -42,6 +42,8 @@
 EXTRA_DIST = \
 	build.xml \
 	build.properties \
+	CMakeLists.txt \
+	coding_standards.md \
 	src \
 	test \
 	README.md
\ No newline at end of file
diff --git a/lib/lua/Makefile.am b/lib/lua/Makefile.am
index 896ff30..4e7f472 100644
--- a/lib/lua/Makefile.am
+++ b/lib/lua/Makefile.am
@@ -54,7 +54,9 @@
 liblualongnumber_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
 liblualongnumber_la_LDFLAGS = $(AM_LDFLAGS) $(LUA_LIB) -lm
 
-EXTRA_DIST = TBinaryProtocol.lua \
+EXTRA_DIST = \
+		coding_standards.md \
+		TBinaryProtocol.lua \
 		TBufferedTransport.lua \
 		TFramedTransport.lua \
 		Thrift.lua \
diff --git a/lib/nodejs/.gitignore b/lib/nodejs/.gitignore
deleted file mode 100644
index 4ebc8ae..0000000
--- a/lib/nodejs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-coverage
diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am
index b8e441b..6d785be 100755
--- a/lib/nodejs/Makefile.am
+++ b/lib/nodejs/Makefile.am
@@ -39,4 +39,5 @@
 	examples \
 	lib \
 	test \
+	coding_standards.md \
 	README.md
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index 60eb1ef..6b0f9dd 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -42,6 +42,7 @@
 	rm -f Makefile-perl.mk.old
 
 EXTRA_DIST = \
+	coding_standards.md \
 	Makefile.PL \
 	test.pl \
 	lib/Thrift.pm \
@@ -57,6 +58,9 @@
 	lib/Thrift/Protocol.pm \
 	lib/Thrift/ProtocolDecorator.pm \
 	lib/Thrift/Server.pm \
+	lib/Thrift/ServerSocket.pm \
 	lib/Thrift/Socket.pm \
+	lib/Thrift/SSLSocket.pm \
+	lib/Thrift/SSLServerSocket.pm \
 	lib/Thrift/Transport.pm \
 	README.md
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index e9d673c..fbf70f9 100755
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -31,6 +31,10 @@
 
 phpmoduledir = `php-config --extension-dir`
 phpmodule_SCRIPTS = src/ext/thrift_protocol/modules/thrift_protocol.so
+
+distclean-local:
+	cd $(phpmodule_SCRIPTS) && $(PHPIZE) --clean
+
 endif
 
 phpdir = $(PHP_PREFIX)/Thrift
@@ -119,6 +123,7 @@
   src/ext/thrift_protocol/run-tests.php \
   src/Thrift.php \
   src/TStringUtils.php \
+  coding_standards.md \
   thrift_protocol.ini \
   README.apache.md \
   README.md
diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am
index 869c544..6e9a27c 100755
--- a/lib/php/test/Makefile.am
+++ b/lib/php/test/Makefile.am
@@ -34,9 +34,9 @@
 	$(PHPUNIT) --log-junit=TEST-json-serializer.xml Test/Thrift/JsonSerialize/
 endif
 
-check-validator: stubs 
-	php Test/Thrift/TestValidators.php 
-	php Test/Thrift/TestValidators.php -oop 
+check-validator: stubs
+	php Test/Thrift/TestValidators.php
+	php Test/Thrift/TestValidators.php -oop
 
 check-protocol:	stubs
 if HAVE_PHPUNIT
@@ -53,5 +53,8 @@
 	$(RM) -r ./packages
 	$(RM) TEST-*.xml
 
-EXTRA_DIST = Test
+EXTRA_DIST = \
+	Test \
+	TestValidators.thrift
+
 
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index adb90f3..2cdbb24 100755
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -35,6 +35,8 @@
 check-local: all
 
 EXTRA_DIST = \
+	CMakeLists.txt \
+	coding_standards.md \
 	compat \
 	setup.py \
 	setup.cfg \
diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index 658eb7d..137edb4 100755
--- a/lib/rb/Makefile.am
+++ b/lib/rb/Makefile.am
@@ -29,6 +29,7 @@
 	$(BUNDLER) exec rake install
 
 clean-local:
+	$(BUNDLER) install
 	$(BUNDLER) exec rake clean
 
 check-local: all
@@ -38,6 +39,7 @@
 endif
 
 EXTRA_DIST = \
+	coding_standards.md \
 	Rakefile \
 	Gemfile \
 	thrift.gemspec \
diff --git a/test/Makefile.am b/test/Makefile.am
index 4c90995..6ebcd27 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -75,10 +75,13 @@
 check-local:
 	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
 
+clean-local:
+	rm -rf $(top_srcdir)/test/gen-html
+
 EXTRA_DIST = \
+	audit \
+	crossrunner \
 	keys \
-	test.py \
-	tests.json \
 	c_glib \
 	cpp \
 	erl \
@@ -98,8 +101,11 @@
 	DebugProtoTest.thrift \
 	DenseLinkingTest.thrift \
 	DocTest.thrift \
+	EnumTest.thrift \
+	known_failures_Linux.json \
 	Include.thrift \
 	JavaBeansTest.thrift \
+	JsDeepConstructorTest.thrift \
 	ManyOptionals.thrift \
 	ManyTypedefs.thrift \
 	NameConflictTest.thrift \
@@ -108,9 +114,14 @@
 	ReuseObjects.thrift \
 	SmallTest.thrift \
 	StressTest.thrift \
+	test.py \
+	tests.json \
 	ThriftTest.thrift \
+	TypedefTest.thrift \
 	FastbinaryTest.py \
-	README.md
+	result.html \
+	README.md \
+	valgrind.suppress
 
 precross-%:
 	$(MAKE) -C $* precross
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 79fd8fd..47711a9 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -67,6 +67,10 @@
 #
 all-local:
 	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
+
+clean-local:
+	rm -rf $(top_srcdir)/tutorial/gen-html
+
 endif
 
 # Any folders or files not listed above being added to SUBDIR need to be placed here in
diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am
index 9bc6318..d8a9dbc 100755
--- a/tutorial/cpp/Makefile.am
+++ b/tutorial/cpp/Makefile.am
@@ -83,5 +83,6 @@
 	$(CPPSTYLE_CMD)
 
 EXTRA_DIST = \
+	CMakeLists.txt \
 	CppClient.cpp \
 	CppServer.cpp