diff --git a/src/core/alloc_type.hpp b/src/core/alloc_type.hpp
index 9c25cc9e3f..5ea812b0e5 100644
--- a/src/core/alloc_type.hpp
+++ b/src/core/alloc_type.hpp
@@ -25,24 +25,8 @@
  */
 template <typename T, size_t length>
 struct SmallStackSafeStackAlloc {
-#if !defined(__NDS__)
 	/** Storing the data on the stack */
 	T data[length];
-#else
-	/** Storing it on the heap */
-	T *data;
-	/** The length (in elements) of data in this allocator. */
-	size_t len;
-
-	/** Allocating the memory */
-	SmallStackSafeStackAlloc() : data(MallocT<T>(length)), len(length) {}
-
-	/** And freeing when it goes out of scope */
-	~SmallStackSafeStackAlloc()
-	{
-		free(data);
-	}
-#endif
 
 	/**
 	 * Gets a pointer to the data stored in this wrapper.
@@ -69,11 +53,7 @@ struct SmallStackSafeStackAlloc {
 	 */
 	inline T *EndOf()
 	{
-#if !defined(__NDS__)
 		return endof(data);
-#else
-		return &data[len];
-#endif
 	}
 };
 
diff --git a/src/stdafx.h b/src/stdafx.h
index 80130ff4df..ac53b6c63d 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -22,9 +22,6 @@
 	#define _GNU_SOURCE
 	#define TROUBLED_INTS
 	#include <strings.h>
-#elif defined(__NDS__)
-	#include <nds/jtypes.h>
-	#define TROUBLED_INTS
 #endif
 
 /* It seems that we need to include stdint.h before anything else
@@ -433,7 +430,7 @@ void NORETURN CDECL error(const char *str, ...) WARN_FORMAT(1, 2);
 	#define OTTD_ASSERT
 #endif
 
-#if defined(__NDS__) || defined(__DJGPP__)
+#if defined(__DJGPP__)
 	/* DJGPP doesn't have C++ conformant _stricmp... */
 	#define _stricmp stricmp
 #elif defined(OPENBSD)