diff --git a/core/Makefile b/core/Makefile
index bc10e5ed..921b2d8d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,9 +1,8 @@
 #(C)2004-2006 SourceMM Development Team
 # Makefile written by David "BAILOPAN" Anderson
 
-SMM_BASE = ../../../sourcemm
-SMM_TRUNK = $(SMM_BASE)/trunk
-HL2SDK = $(SMM_BASE)/hl2sdk
+SMM_BASE = ../../sourcemm
+HL2SDK = ../../hl2sdk
 SMSDK = ..
 SRCDS = ~/srcds
 
@@ -42,7 +41,7 @@ OBJECTS_C = zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio
 LINK = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so tier0_i486.so -lpthread -static-libgcc
 
 INCLUDE = -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
-          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
+          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_BASE) -I$(SMM_BASE)/sourcehook -I$(SMM_BASE)/sourcemm \
 	  -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 	  -Isystems
 
diff --git a/extensions/bintools/Makefile b/extensions/bintools/Makefile
index 6272ffe0..3eb83f90 100644
--- a/extensions/bintools/Makefile
+++ b/extensions/bintools/Makefile
@@ -3,7 +3,7 @@
 
 SMSDK = ../..
 SRCDS = ~/srcds
-SOURCEMM = ../../../../sourcemm
+SOURCEMM = ../../../sourcemm
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
diff --git a/extensions/geoip/Makefile b/extensions/geoip/Makefile
index b9a013f4..c81e89af 100644
--- a/extensions/geoip/Makefile
+++ b/extensions/geoip/Makefile
@@ -3,7 +3,7 @@
 
 SMSDK = ../..
 SRCDS = ~/srcds
-SOURCEMM = ../../../../sourcemm
+SOURCEMM = ../../../sourcemm
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
diff --git a/extensions/mysql/Makefile b/extensions/mysql/Makefile
index 8fca9c02..fa6451e9 100644
--- a/extensions/mysql/Makefile
+++ b/extensions/mysql/Makefile
@@ -3,7 +3,7 @@
 
 SMSDK = ../..
 SRCDS = ~/srcds
-SOURCEMM = ../../../../sourcemm
+SOURCEMM = ../../../sourcemm
 MYSQL = ../../../mysql-5.0
 
 #####################################
@@ -32,13 +32,12 @@ CPP = gcc-4.1
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
 HL2SDK = $(SOURCEMM)/hl2sdk
-SMM_TRUNK = $(SOURCEMM)/trunk
 
 LINK = $(LINK_HL2) $(MYSQL)/lib/libmysqlclient_r.a -lz -static-libgcc -lpthread
 
 INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine \
 	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 \
-	-I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
+	-I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \
 	-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 	-I$(MYSQL)/include
 
diff --git a/extensions/sdktools/Makefile b/extensions/sdktools/Makefile
index eb92d33c..0585c78a 100644
--- a/extensions/sdktools/Makefile
+++ b/extensions/sdktools/Makefile
@@ -3,7 +3,8 @@
 
 SMSDK = ../..
 SRCDS = ~/srcds
-SOURCEMM = ../../../../sourcemm
+SOURCEMM = ../../../sourcemm
+HL2SDK = ../../../hl2sdk
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -29,13 +30,11 @@ CPP = gcc-4.1
 
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
-HL2SDK = $(SOURCEMM)/hl2sdk
-SMM_TRUNK = $(SOURCEMM)/trunk
 
 LINK = $(LINK_HL2) -static-libgcc
 
 INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
-          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
+          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \
 	  -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 
 CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -Wno-switch -Wno-unused -fPIC -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H
diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile
index 23b74044..5f77c657 100644
--- a/extensions/sqlite/Makefile
+++ b/extensions/sqlite/Makefile
@@ -3,7 +3,7 @@
 
 SMSDK = ../..
 SRCDS = ~/srcds
-SOURCEMM = ../../../../sourcemm
+SOURCEMM = ../../../sourcemm
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -46,12 +46,11 @@ CPP = gcc-4.1
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
 HL2SDK = $(SOURCEMM)/hl2sdk
-SMM_TRUNK = $(SOURCEMM)/trunk
 
 LINK = $(LINK_HL2) -static-libgcc -lpthread
 
 INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
-          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
+          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \
 	  -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 
 CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -msse -DSOURCEMOD_BUILD -Wno-uninitialized -DTHREADSAFE -DSQLITE_OMIT_LOAD_EXTENSION
diff --git a/public/sample_ext/Makefile b/public/sample_ext/Makefile
index 8c735d7d..1262cd63 100644
--- a/public/sample_ext/Makefile
+++ b/public/sample_ext/Makefile
@@ -3,7 +3,8 @@
 
 SMSDK = ../..
 SRCDS = ~/srcds
-SOURCEMM = ../../../../sourcemm
+SOURCEMM = ../../../sourcemm
+HL2SDK = ../../../hl2sdk
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -27,13 +28,11 @@ CPP = gcc-4.1
 
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
-HL2SDK = $(SOURCEMM)/hl2sdk
-SMM_TRUNK = $(SOURCEMM)/trunk
 
 LINK = $(LINK_HL2) -static-libgcc
 
 INCLUDE = -I. -I.. -Isdk -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
-          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_TRUNK) -I$(SMM_TRUNK)/sourcehook -I$(SMM_TRUNK)/sourcemm \
+          -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SOURCEMM) -I$(SOURCEMM)/sourcehook -I$(SOURCEMM)/sourcemm \
 	  -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \
 
 CFLAGS = -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -fPIC -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H