diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 21f70dd..6e2b2ba 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -224,8 +224,7 @@
                         src/thrift/processor/test/ServerThread.cpp \
                         src/thrift/processor/test/EventLog.h \
                         src/thrift/processor/test/Handlers.h \
-                        src/thrift/processor/test/ServerThread.h \
-                        src/thrift/processor/test/gen-cpp/ChildService.h
+                        src/thrift/processor/test/ServerThread.h
 
 processor_test_LDADD = libprocessortest.la \
                        libthrift.la \
@@ -249,14 +248,14 @@
 	$(THRIFT) --gen cpp:templates,cob_style $<
 
 nodist_libprocessortest_la_SOURCES = \
-       gen-cpp/ChildService.h \
-       gen-cpp/ChildService.cpp \
-       gen-cpp/ParentService.h \
-       gen-cpp/ParentService.cpp
+       src/thrift/processor/test/gen-cpp/ChildService.h \
+       src/thrift/processor/test/gen-cpp/ChildService.cpp \
+       src/thrift/processor/test/gen-cpp/ParentService.h \
+       src/thrift/processor/test/gen-cpp/ParentService.cpp
 
 WINDOWS_DIST = \
              README_WINDOWS \
-             src/windows \
+             src/thrift/windows \
              thrift.sln \
              libthrift.vcxproj \
              libthrift.vcxproj.filters \
diff --git a/test/Makefile.am b/test/Makefile.am
index 1ad9063..e9d02e2 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -53,7 +53,6 @@
 EXTRA_DIST = \
 	cpp \
 	csharp \
-	erl \
 	hs \
 	nodejs \
 	ocaml \