diff --git a/src/Makefile b/src/Makefile
index c182a88cf..16cb8912d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -494,10 +494,10 @@ OBJS:=$(i_main_o) \
 		$(OBJDIR)/y_inter.o  \
 		$(OBJDIR)/st_stuff.o \
 		$(OBJDIR)/k_kart.o   \
+		$(OBJDIR)/k_pwrlv.o  \
 		$(OBJDIR)/k_waypoint.o\
 		$(OBJDIR)/k_pathfind.o\
 		$(OBJDIR)/k_bheap.o  \
-		$(OBJDIR)/k_pwrlv.o  \
 		$(OBJDIR)/m_aatree.o \
 		$(OBJDIR)/m_anigif.o \
 		$(OBJDIR)/m_argv.o   \
diff --git a/src/p_map.c b/src/p_map.c
index 1ddbbc10a..0d5a76c70 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -223,6 +223,8 @@ static boolean P_SpecialIsLinedefCrossType(UINT16 ldspecial)
 	return linedefcrossspecial;
 }
 
+//#define TELEPORTJANK
+
 boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 {
 	//INT32 pflags;
diff --git a/src/p_setup.c b/src/p_setup.c
index 784ccd24f..e0b3550dc 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -84,8 +84,8 @@
 
 // SRB2Kart
 #include "k_kart.h"
-#include "k_waypoint.h"
 #include "k_pwrlv.h"
+#include "k_waypoint.h"
 
 //
 // Map MD5, calculated on level load.