diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c
index 582bce16178..e4a1350829e 100644
--- a/src/gallium/auxiliary/translate/translate_sse.c
+++ b/src/gallium/auxiliary/translate/translate_sse.c
@@ -36,7 +36,7 @@
 #include "translate.h"
 
 
-#if (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)) && !defined(EMBEDDED_DEVICE)
+#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
 
 #include "rtasm/rtasm_x86sse.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c
index 8309335aebc..07afe037052 100644
--- a/src/gallium/drivers/llvmpipe/lp_context.c
+++ b/src/gallium/drivers/llvmpipe/lp_context.c
@@ -49,12 +49,6 @@
 #include "lp_screen.h"
 #include "lp_fence.h"
 
-/* This is only safe if there's just one concurrent context */
-#ifdef EMBEDDED_DEVICE
-#define USE_GLOBAL_LLVM_CONTEXT
-#endif
-
-
 static void
 llvmpipe_destroy(struct pipe_context *pipe)
 {
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index a4d7b405a44..ef8b95bf20a 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -1096,9 +1096,6 @@ llvmpipe_create_screen(struct sw_winsys *winsys)
    screen->use_tgsi = (LP_DEBUG & DEBUG_TGSI_IR);
    screen->num_threads = util_get_cpu_caps()->nr_cpus > 1
       ? util_get_cpu_caps()->nr_cpus : 0;
-#ifdef EMBEDDED_DEVICE
-   screen->num_threads = MIN2(screen->num_threads, 2);
-#endif
    screen->num_threads = debug_get_num_option("LP_NUM_THREADS",
                                               screen->num_threads);
    screen->num_threads = MIN2(screen->num_threads, LP_MAX_THREADS);
diff --git a/src/util/os_memory.h b/src/util/os_memory.h
index ad88e70f14f..6efd1547f2f 100644
--- a/src/util/os_memory.h
+++ b/src/util/os_memory.h
@@ -34,41 +34,6 @@
 #ifndef _OS_MEMORY_H_
 #define _OS_MEMORY_H_
 
-#if defined(EMBEDDED_DEVICE)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *
-os_malloc(size_t size);
-
-void *
-os_calloc(size_t count, size_t size);
-
-void
-os_free(void *ptr);
-
-void *
-os_realloc(void *ptr, size_t old_size, size_t new_size);
-
-void *
-os_malloc_aligned(size_t size, size_t alignment);
-
-void
-os_free_aligned(void *ptr);
-
-void *
-os_realloc_aligned(void *ptr, size_t oldsize, size_t newsize, size_t alignemnt);
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
-
-#  include "os_memory_stdc.h"
-
-#endif
+#include "os_memory_stdc.h"
 
 #endif /* _OS_MEMORY_H_ */
diff --git a/src/util/os_misc.c b/src/util/os_misc.c
index 61e9746c8ff..13963afdffe 100644
--- a/src/util/os_misc.c
+++ b/src/util/os_misc.c
@@ -201,8 +201,6 @@ os_get_android_option(const char *name)
 }
 #endif
 
-
-#if !defined(EMBEDDED_DEVICE)
 const char *
 os_get_option(const char *name)
 {
@@ -214,7 +212,6 @@ os_get_option(const char *name)
 #endif
    return opt;
 }
-#endif /* !EMBEDDED_DEVICE */
 
 /**
  * Return the size of the total physical memory.
diff --git a/src/util/u_debug.c b/src/util/u_debug.c
index 4ff018ba64a..a89aaa66b04 100644
--- a/src/util/u_debug.c
+++ b/src/util/u_debug.c
@@ -46,7 +46,7 @@ void
 _debug_vprintf(const char *format, va_list ap)
 {
    static char buf[4096] = {'\0'};
-#if DETECT_OS_WINDOWS || defined(EMBEDDED_DEVICE)
+#if DETECT_OS_WINDOWS
    /* We buffer until we find a newline. */
    size_t len = strlen(buf);
    int ret = vsnprintf(buf + len, sizeof(buf) - len, format, ap);