38 files changed, 68 insertions, 68 deletions
diff --git a/.gitmodules b/.gitmodules
index 538fac3eb..b7db0bcf2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,17 +1,17 @@
 [submodule "speex"]
-	path = speex
+	path = 3rdparty/speex-src
 	url = git://git.xiph.org/speex.git/
 [submodule "celt-0.7.0-src"]
-	path = celt-0.7.0-src
+	path = 3rdparty/celt-0.7.0-src
 	url = https://github.com/mumble-voip/celt-0.7.0.git
 [submodule "celt-0.11.0-src"]
-	path = celt-0.11.0-src
+	path = 3rdparty/celt-0.11.0-src
 	url = git://git.xiph.org/celt.git/
 [submodule "opus-src"]
-	path = opus-src
+	path = 3rdparty/opus-src
 	url = https://github.com/mumble-voip/opus.git
 [submodule "sbcelt-src"]
-	path = sbcelt-src
+	path = 3rdparty/sbcelt-src
 	url = git://github.com/mumble-voip/sbcelt.git
 [submodule "3rdparty/fx11-src"]
 	path = 3rdparty/fx11-src
diff --git a/celt-0.11.0-build/celt-0.11.0-build.pro b/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
index f038699f4..ca5d2d558 100644
--- a/celt-0.11.0-build/celt-0.11.0-build.pro
+++ b/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 BUILDDIR=$$basename(PWD)
 SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@@ -50,11 +50,11 @@ SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c
 
 CONFIG(debug, debug|release) {
   CONFIG += console
-  DESTDIR	= ../debug
+  DESTDIR	= ../../debug
 }
 
 CONFIG(release, debug|release) {
-  DESTDIR	= ../release
+  DESTDIR	= ../../release
 }
 
-include(../symbols.pri)
+include(../../symbols.pri)
diff --git a/celt-0.11.0-build/celt-0.11.0.rc b/3rdparty/celt-0.11.0-build/celt-0.11.0.rc
index acda63ca5..acda63ca5 100644
--- a/celt-0.11.0-build/celt-0.11.0.rc
+++ b/3rdparty/celt-0.11.0-build/celt-0.11.0.rc
diff --git a/celt-0.11.0-build/config.h b/3rdparty/celt-0.11.0-build/config.h
index 1a8049a2d..1a8049a2d 100644
--- a/celt-0.11.0-build/config.h
+++ b/3rdparty/celt-0.11.0-build/config.h
diff --git a/celt-0.11.0-build/win32/config.h b/3rdparty/celt-0.11.0-build/win32/config.h
index 0d8bd07da..0d8bd07da 100644
--- a/celt-0.11.0-build/win32/config.h
+++ b/3rdparty/celt-0.11.0-build/win32/config.h
diff --git a/celt-0.11.0-src b/3rdparty/celt-0.11.0-src
-Subproject e3d39fec7c44d1841e817d3b1986bfdc4d0863a
+Subproject e3d39fec7c44d1841e817d3b1986bfdc4d0863a
diff --git a/celt-0.7.0-build/celt-0.7.0-build.pro b/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro
index 28ce8a327..563cba055 100644
--- a/celt-0.7.0-build/celt-0.7.0-build.pro
+++ b/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 BUILDDIR=$$basename(PWD)
 SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@@ -55,11 +55,11 @@ SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c
 
 CONFIG(debug, debug|release) {
   CONFIG += console
-  DESTDIR	= ../debug
+  DESTDIR	= ../../debug
 }
 
 CONFIG(release, debug|release) {
-  DESTDIR	= ../release
+  DESTDIR	= ../../release
 }
 
-include(../symbols.pri)
+include(../../symbols.pri)
diff --git a/celt-0.7.0-build/celt-0.7.0.rc b/3rdparty/celt-0.7.0-build/celt-0.7.0.rc
index cbec28050..cbec28050 100644
--- a/celt-0.7.0-build/celt-0.7.0.rc
+++ b/3rdparty/celt-0.7.0-build/celt-0.7.0.rc
diff --git a/celt-0.7.0-build/config.h b/3rdparty/celt-0.7.0-build/config.h
index f2af5dc12..f2af5dc12 100644
--- a/celt-0.7.0-build/config.h
+++ b/3rdparty/celt-0.7.0-build/config.h
diff --git a/celt-0.7.0-build/win32/config.h b/3rdparty/celt-0.7.0-build/win32/config.h
index 21f701047..21f701047 100644
--- a/celt-0.7.0-build/win32/config.h
+++ b/3rdparty/celt-0.7.0-build/win32/config.h
diff --git a/celt-0.7.0-src b/3rdparty/celt-0.7.0-src
-Subproject 5a16cda6d78cda0cd14eb13c56c65d82724842e
+Subproject 5a16cda6d78cda0cd14eb13c56c65d82724842e
diff --git a/opus-build/Win32/config.h b/3rdparty/opus-build/Win32/config.h
index 81819b29a..81819b29a 100644
--- a/opus-build/Win32/config.h
+++ b/3rdparty/opus-build/Win32/config.h
diff --git a/opus-build/Win32/version.h b/3rdparty/opus-build/Win32/version.h
index fbe833bbf..fbe833bbf 100644
--- a/opus-build/Win32/version.h
+++ b/3rdparty/opus-build/Win32/version.h
diff --git a/opus-build/config.h b/3rdparty/opus-build/config.h
index bc87784d6..bc87784d6 100644
--- a/opus-build/config.h
+++ b/3rdparty/opus-build/config.h
diff --git a/opus-build/opus-build.pro b/3rdparty/opus-build/opus-build.pro
index b17a6135e..3472a9a71 100644
--- a/opus-build/opus-build.pro
+++ b/3rdparty/opus-build/opus-build.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 BUILDDIR=$$basename(PWD)
 SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@@ -209,11 +209,11 @@ src/mlp_data.c
 
 CONFIG(debug, debug|release) {
 	CONFIG += console
-	DESTDIR = ../debug
+	DESTDIR = ../../debug
 }
 
 CONFIG(release, debug|release) {
-	DESTDIR = ../release
+	DESTDIR = ../../release
 }
 
 macx:!CONFIG(static) {
@@ -225,4 +225,4 @@ macx:!CONFIG(static) {
 	ALL_DEPS += libname
 }
 
-include(../symbols.pri)
+include(../../symbols.pri)
diff --git a/opus-src b/3rdparty/opus-src
-Subproject b64bc68de49fecc43d1834bdff4a1b05bf4a977
+Subproject b64bc68de49fecc43d1834bdff4a1b05bf4a977
diff --git a/sbcelt-helper-build/sbcelt-helper-build.pro b/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro
index 70bf12bd9..2b504c750 100644
--- a/sbcelt-helper-build/sbcelt-helper-build.pro
+++ b/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro
@@ -1,4 +1,4 @@
-include (../compiler.pri)
+include (../../compiler.pri)
 
 BUILDDIR=$$basename(PWD)
 SOURCEDIR=$$replace(BUILDDIR,-helper-build,-src)
@@ -68,12 +68,12 @@ macx {
 }
 
 CONFIG(release, debug|release) {
-  DESTDIR = ../release
+  DESTDIR = ../../release
 }
 
 CONFIG(debug, debug|release) {
   DEFINES *= USE_LOGFILE
-  DESTDIR = ../debug/
+  DESTDIR = ../../debug/
 }
 
-include(../symbols.pri)
+include(../../symbols.pri)
diff --git a/sbcelt-lib-build/sbcelt-lib-build.pro b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
index e4c524fff..dae0c83f4 100644
--- a/sbcelt-lib-build/sbcelt-lib-build.pro
+++ b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 BUILDDIR=$$basename(PWD)
 SOURCEDIR=$$replace(BUILDDIR,-lib-build,-src)
@@ -54,11 +54,11 @@ macx {
 
 CONFIG(debug, debug|release) {
   CONFIG += console
-  DESTDIR	= ../debug
+  DESTDIR	= ../../debug
 }
 
 CONFIG(release, debug|release) {
-  DESTDIR	= ../release
+  DESTDIR	= ../../release
 }
 
-include(../symbols.pri)
+include(../../symbols.pri)
diff --git a/sbcelt-src b/3rdparty/sbcelt-src
-Subproject a2ce9cf9b83f043a94ba73bd1216013ff56eba9
+Subproject a2ce9cf9b83f043a94ba73bd1216013ff56eba9
diff --git a/speexbuild/AGC.cpp b/3rdparty/speex-build/AGC.cpp
index b4faa19e2..b4faa19e2 100644
--- a/speexbuild/AGC.cpp
+++ b/3rdparty/speex-build/AGC.cpp
diff --git a/speexbuild/AGC.pro b/3rdparty/speex-build/AGC.pro
index 4ff09e111..999193d49 100644
--- a/speexbuild/AGC.pro
+++ b/3rdparty/speex-build/AGC.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 TEMPLATE	=app
 CONFIG  += qt warn_on release console
@@ -6,6 +6,6 @@ QT -= gui
 TARGET = AGC
 SOURCES = AGC.cpp
 HEADERS = Timer.h
-INCLUDEPATH = ../src ../speex/include
+INCLUDEPATH = ../src ../speex-src/include
 LIBS += -lspeex
-LIBPATH += ../release
+LIBPATH += ../../release
diff --git a/speexbuild/ResampMark.cpp b/3rdparty/speex-build/ResampMark.cpp
index 01c0c4a33..01c0c4a33 100644
--- a/speexbuild/ResampMark.cpp
+++ b/3rdparty/speex-build/ResampMark.cpp
diff --git a/speexbuild/ResampMark.pro b/3rdparty/speex-build/ResampMark.pro
index e50b9460a..564be7d4e 100644
--- a/speexbuild/ResampMark.pro
+++ b/3rdparty/speex-build/ResampMark.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 TEMPLATE	=app
 CONFIG  += qt warn_on release console
@@ -6,6 +6,6 @@ QT -= gui
 TARGET = ResampMark
 SOURCES = ResampMark.cpp
 HEADERS = Timer.h
-INCLUDEPATH = ../src ../speex/include
+INCLUDEPATH = ../../src ../speex-src/include
 LIBS += -lspeex
-LIBPATH += ../release
+LIBPATH += ../../release
diff --git a/speexbuild/SpeexMark.cpp b/3rdparty/speex-build/SpeexMark.cpp
index 937c273a3..937c273a3 100644
--- a/speexbuild/SpeexMark.cpp
+++ b/3rdparty/speex-build/SpeexMark.cpp
diff --git a/speexbuild/SpeexMark.pro b/3rdparty/speex-build/SpeexMark.pro
index 8feac26b2..2be94c59d 100644
--- a/speexbuild/SpeexMark.pro
+++ b/3rdparty/speex-build/SpeexMark.pro
@@ -1,4 +1,4 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
 TEMPLATE	=app
 CONFIG  += qt warn_on release console
@@ -6,6 +6,6 @@ QT -= gui
 TARGET = SpeexMark
 SOURCES = SpeexMark.cpp
 HEADERS = Timer.h
-INCLUDEPATH = ../src ../speex/include
+INCLUDEPATH = ../src ../speex-src/include
 LIBS += -lspeex
-LIBPATH += ../release
+LIBPATH += ../../release
diff --git a/speexbuild/config.h b/3rdparty/speex-build/config.h
index 7b3f42b68..7b3f42b68 100644
--- a/speexbuild/config.h
+++ b/3rdparty/speex-build/config.h
diff --git a/speexbuild/mumble_speex_init.c b/3rdparty/speex-build/mumble_speex_init.c
index 8934d2b04..8934d2b04 100644
--- a/speexbuild/mumble_speex_init.c
+++ b/3rdparty/speex-build/mumble_speex_init.c
diff --git a/speexbuild/speexbuild.pro b/3rdparty/speex-build/speex-build.pro
index 5652bf3ca..a4be6ce28 100644
--- a/speexbuild/speexbuild.pro
+++ b/3rdparty/speex-build/speex-build.pro
@@ -1,6 +1,6 @@
-include(../compiler.pri)
+include(../../compiler.pri)
 
-!exists(../speex/COPYING) {
+!exists(../speex-src/COPYING) {
 	message("The speex/ directory was not found. You need to do one of the following:")
 	message("")
 	message("Option 1: Use Speex Git:")
@@ -15,11 +15,11 @@ include(../compiler.pri)
 
 CONFIG(debug, debug|release) {
   CONFIG += console
-  DESTDIR	= ../debug
+  DESTDIR	= ../../debug
 }
 
 CONFIG(release, debug|release) {
-  DESTDIR	= ../release
+  DESTDIR	= ../../release
 }
 
 TEMPLATE = lib
@@ -27,13 +27,13 @@ CONFIG -= qt
 CONFIG += debug_and_release
 CONFIG -= warn_on
 CONFIG += warn_off
-VPATH	= ../speex/libspeex
+VPATH	= ../speex-src/libspeex
 TARGET = speex
 DEFINES += NDEBUG HAVE_CONFIG_H
-INCLUDEPATH = ../speex/include ../speex/libspeex
+INCLUDEPATH = ../speex-src/include ../speex-src/libspeex
 
 win32 {
-  INCLUDEPATH += ../speexbuild/win32
+  INCLUDEPATH += ../speex-build/win32
   DEFINES+=WIN32 _WINDOWS _USE_SSE _USE_MATH_DEFINES
   SOURCES	*= mumble_speex_init.c
 
@@ -57,7 +57,7 @@ win32 {
   }
 } else {
   CONFIG += staticlib
-  INCLUDEPATH += ../speexbuild
+  INCLUDEPATH += ../speex-srcbuild
 }
 
 DIST = config.h speex.def speex/speex_config_types.h
diff --git a/speexbuild/speex.def b/3rdparty/speex-build/speex.def
index 1a23179ff..1a23179ff 100644
--- a/speexbuild/speex.def
+++ b/3rdparty/speex-build/speex.def
diff --git a/speexbuild/speex/speex_config_types.h b/3rdparty/speex-build/speex/speex_config_types.h
index bd548546b..bd548546b 100644
--- a/speexbuild/speex/speex_config_types.h
+++ b/3rdparty/speex-build/speex/speex_config_types.h
diff --git a/speexbuild/win32/config.h b/3rdparty/speex-build/win32/config.h
index 47a4ffd13..47a4ffd13 100644
--- a/speexbuild/win32/config.h
+++ b/3rdparty/speex-build/win32/config.h
diff --git a/speex b/3rdparty/speex-src
-Subproject a6d05eb5ff9d5062852cdf7df574bec728921ef
+Subproject a6d05eb5ff9d5062852cdf7df574bec728921ef
diff --git a/main.pro b/main.pro
index 4bc7f49d5..376081316 100644
--- a/main.pro
+++ b/main.pro
@@ -6,17 +6,17 @@ CONFIG *= ordered debug_and_release
 	CONFIG *= no-bundled-speex
   }
   !CONFIG(no-bundled-speex) {
-    SUBDIRS *= speexbuild
+    SUBDIRS *= 3rdparty/speex-build
   }
 
   CONFIG(sbcelt) {
-    SUBDIRS *= celt-0.7.0-build sbcelt-lib-build sbcelt-helper-build
+    SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/sbcelt-lib-build 3rdparty/sbcelt-helper-build
   } else {
     unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) {
       CONFIG *= no-bundled-celt
     }
     !CONFIG(no-bundled-celt) {
-      SUBDIRS *= celt-0.7.0-build celt-0.11.0-build
+      SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/celt-0.11.0-build
     }
   }
 
@@ -25,7 +25,7 @@ CONFIG *= ordered debug_and_release
   }
 
   CONFIG(opus):!CONFIG(no-bundled-opus) {
-	SUBDIRS *= opus-build
+	SUBDIRS *= 3rdparty/opus-build
   }
 
   win32 {
diff --git a/scripts/mklic.pl b/scripts/mklic.pl
index ee085f71d..4c295fa65 100755
--- a/scripts/mklic.pl
+++ b/scripts/mklic.pl
@@ -65,9 +65,9 @@ print $F "\n\n";
 
 # List of 3rd party licenses  [<variableName>, <pathToLicenseFile>, <DisplayName>, <URL>]
 my @thirdPartyLicenses = (
-    ["licenseCELT", "../celt-0.11.0-src/COPYING", "CELT", "http://www.celt-codec.org/"],
-    ["licenseOpus", "../opus-src/COPYING", "Opus", "http://www.opus-codec.org/"],
-    ["licenseSPEEX", "../speex/COPYING", "Speex", "http://www.speex.org/"],
+    ["licenseCELT", "../3rdparty/celt-0.11.0-src/COPYING", "CELT", "http://www.celt-codec.org/"],
+    ["licenseOpus", "../3rdparty/opus-src/COPYING", "Opus", "http://www.opus-codec.org/"],
+    ["licenseSPEEX", "../3rdparty/speex-src/COPYING", "Speex", "http://www.speex.org/"],
     ["licenseOpenSSL", "../3rdPartyLicenses/openssl_license.txt", "OpenSSL", "http://www.openssl.org/"],
     ["licenseLibsndfile", "../3rdPartyLicenses/libsndfile_license.txt", "libsndfile", "http://www.mega-nerd.com/libsndfile/"],
     ["licenseOgg", "../3rdPartyLicenses/libogg_license.txt", "libogg", "http://www.xiph.org/"],
diff --git a/scripts/release.pl b/scripts/release.pl
index 47c584fcb..0de96d7b9 100755
--- a/scripts/release.pl
+++ b/scripts/release.pl
@@ -46,15 +46,15 @@ my $exclusions = join(" --exclude=", ("",
      # Exclude the archive we are currently writing to
      "${ballname}.*",
      # Exclude files with Debian FSG licensing issues (#1230)
-     "${ballname}/speex/doc/draft-herlein-avt-rtp-speex-00.txt",
-     "${ballname}/speex/doc/draft-herlein-speex-rtp-profile-02.txt",
-     "${ballname}/speex/doc/draft-herlein-speex-rtp-profile-03.txt",
-     "${ballname}/speex/doc/draft-ietf-avt-rtp-speex-00.txt",
-     "${ballname}/speex/doc/draft-ietf-avt-rtp-speex-01-tmp.txt",
-     "${ballname}/speex/doc/draft-ietf-avt-rtp-speex-05-tmp.txt",
-     "${ballname}/speex/doc/manual.lyx",
-     "${ballname}/celt-0.11.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt",
-     "${ballname}/celt-0.7.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt"
+     "${ballname}/3rdparty/speex-src/doc/draft-herlein-avt-rtp-speex-00.txt",
+     "${ballname}/3rdparty/speex-src/doc/draft-herlein-speex-rtp-profile-02.txt",
+     "${ballname}/3rdparty/speex-src/doc/draft-herlein-speex-rtp-profile-03.txt",
+     "${ballname}/3rdparty/speex-src/doc/draft-ietf-avt-rtp-speex-00.txt",
+     "${ballname}/3rdparty/speex-src/doc/draft-ietf-avt-rtp-speex-01-tmp.txt",
+     "${ballname}/3rdparty/speex-src/doc/draft-ietf-avt-rtp-speex-05-tmp.txt",
+     "${ballname}/3rdparty/speex-src/doc/manual.lyx",
+     "${ballname}/3rdparty/celt-0.11.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt",
+     "${ballname}/3rdparty/celt-0.7.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt"
     )
 );
 
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
index df8b00389..83d554a44 100644
--- a/src/mumble/mumble.pro
+++ b/src/mumble/mumble.pro
@@ -265,14 +265,14 @@ CONFIG(no-bundled-speex) {
 }
 
 !CONFIG(no-bundled-speex) {
-  INCLUDEPATH	*= ../../speex/include ../../speex/libspeex ../../speexbuild
+  INCLUDEPATH	*= ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build
   LIBS 		*= -lspeex
 }
 
 CONFIG(sbcelt) {
   SOURCES -= CELTCodec.cpp
   SOURCES += CELTCodec_sbcelt.cpp
-  INCLUDEPATH *= ../../celt-0.7.0-src/libcelt ../../sbcelt-src
+  INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/sbcelt-src
   LIBS *= -lcelt -lsbcelt
   DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT
 } else {
@@ -283,7 +283,7 @@ CONFIG(sbcelt) {
     INCLUDEPATH	*= /usr/include/celt
   }
   !CONFIG(no-bundled-celt) {
-    INCLUDEPATH	*= ../../celt-0.7.0-src/libcelt
+    INCLUDEPATH	*= ../../3rdparty/celt-0.7.0-src/libcelt
   }
 }
 
@@ -316,7 +316,7 @@ unix:!CONFIG(bundled-opus):system(pkg-config --exists opus) {
   }
 
   CONFIG(opus) {
-    INCLUDEPATH *= ../../opus-src/celt ../../opus-src/include ../../opus-src/src ../../opus-build/src
+    INCLUDEPATH *= ../../3rdparty/opus-src/celt ../../3rdparty/opus-src/include ../../3rdparty/opus-src/src ../../3rdparty/opus-build/src
     DEFINES *= USE_OPUS
     LIBS *= -lopus
   }
@@ -374,10 +374,10 @@ unix {
   }
 
   !CONFIG(no-bundled-speex) {
-    QMAKE_CFLAGS *= -I../../speex/include -I../../speexbuild
-    QMAKE_CXXFLAGS *= -I../../speex/include -I../../speexbuild
-    QMAKE_CXXFLAGS_RELEASE *= -I../../speex/include -I../../speexbuild
-    QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
+    QMAKE_CFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
+    QMAKE_CXXFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
+    QMAKE_CXXFLAGS_RELEASE *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
+    QMAKE_CXXFLAGS_DEBUG *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
   }
 
   CONFIG *= link_pkgconfig
diff --git a/src/tests/OverlayTest.pro b/src/tests/OverlayTest.pro
index f8ceb34ef..14028f903 100644
--- a/src/tests/OverlayTest.pro
+++ b/src/tests/OverlayTest.pro
@@ -15,4 +15,4 @@ win32 {
 }
 
 VPATH += ..
-INCLUDEPATH += .. ../murmur ../mumble ../../celt-0.7.0-src/libcelt ../../speex/include
+INCLUDEPATH += .. ../murmur ../mumble ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/speex-src/include
diff --git a/src/tests/Resample.pro b/src/tests/Resample.pro
index 9279f6572..7a85dde40 100644
--- a/src/tests/Resample.pro
+++ b/src/tests/Resample.pro
@@ -7,7 +7,7 @@ TARGET = Resample
 SOURCES = Resample.cpp Timer.cpp
 HEADERS = Timer.h
 VPATH += ..
-INCLUDEPATH	*= .. ../../speex/include ../../speex/libspeex ../../speexbuild
+INCLUDEPATH	*= .. ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build
 LIBS 		*= -lspeex
 
 win32 {