diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 06cde603be4..dbbbc5d2482 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -620,8 +620,6 @@ WINCE		= @WINCE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
-MINIMO		= @MINIMO@
-
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 NEXT_ROOT	= @NEXT_ROOT@
 GCC_VERSION	= @GCC_VERSION@
diff --git a/config/config.mk b/config/config.mk
index 4d6f160abb7..aed5778a20b 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -412,28 +412,6 @@ endif
 endif
 endif
 
-ifdef MINIMO
-ifdef LIBXUL_LIBRARY
-DEFINES += \
-		-D_IMPL_NS_COM \
-		-DEXPORT_XPT_API \
-		-DEXPORT_XPTC_API \
-		-DEXPORT_XPTI_API \
-		-D_IMPL_NS_COM_OBSOLETE \
-		-D_IMPL_NS_GFX \
-		-D_IMPL_NS_WIDGET \
-		-DIMPL_XREAPI \
-		-DIMPL_NS_NET \
-		-DIMPL_THEBES \
-		$(NULL)
-endif
-
-ifdef WINCE
-DEFINES += -D_NSPR_BUILD_
-endif
-
-endif
-
 # Force _all_ exported methods to be |_declspec(dllexport)| when we're
 # building them into the executable.
 
diff --git a/configure.in b/configure.in
index b23782c40a3..7f3dab164dc 100644
--- a/configure.in
+++ b/configure.in
@@ -4385,7 +4385,6 @@ MOZ_ARG_ENABLE_STRING(application,
                             suite
                             browser (Firefox)
                             mail (Thunderbird)
-                            minimo
                             composer
                             calendar (Sunbird)
                             xulrunner
@@ -4402,16 +4401,7 @@ if test "$MOZ_BUILD_APP" = "macbrowser"; then
     MOZ_BUILD_APP=camino
 fi
 
-case "$MOZ_BUILD_APP" in
-minimo)
-  MOZ_EMBEDDING_PROFILE=basic
-  ;;
-
-*)
-  MOZ_EMBEDDING_PROFILE=default
-  ;;
-esac
-
+MOZ_EMBEDDING_PROFILE=default
 MOZ_ARG_WITH_STRING(embedding-profile,
 [  --with-embedding-profile=default|basic|minimal
                        see http://wiki.mozilla.org/Gecko:Small_Device_Support],
@@ -4600,10 +4590,6 @@ browser)
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
-minimo)
-  AC_DEFINE(MINIMO)
-  ;;
-
 mail)
   AC_DEFINE(MOZ_THUNDERBIRD)
   ;;
diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in
index 4938cbfd690..5da90413914 100644
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@@ -54,12 +54,6 @@ REQUIRES	= xpcom \
 		  embedcomponents \
 		  $(NULL)
 
-ifdef MINIMO
-# For minimo, we would really like to treat this as a LIBXUL
-# library so that we can get the correct export defines.
-LIBXUL_LIBRARY = 1
-endif
-
 DEFINES += -DMOZILLA_STRICT_API
 
 SDK_HEADERS         = \
diff --git a/embedding/browser/photon/src/Makefile.in b/embedding/browser/photon/src/Makefile.in
index ccfeb1546f6..80a50c2acef 100644
--- a/embedding/browser/photon/src/Makefile.in
+++ b/embedding/browser/photon/src/Makefile.in
@@ -138,11 +138,7 @@ ifdef BUILD_STATIC_LIBS
 # This is so sick! We'll work backwards from the embedding manifest to
 # produce the set of components that we need to link in to a
 # ``minimal'' embedding harness.
-ifdef MINIMO
-EMBED_MANIFEST=$(topsrcdir)/embedding/config/minimo-qnx
-else
 EMBED_MANIFEST=$(topsrcdir)/embedding/config/basebrowser-qnx
-endif
 
 ifdef MOZ_FAT_EMBED
 EMBED_LINK_COMPS=$(FINAL_LINK_COMPS)
diff --git a/embedding/config/Makefile.in b/embedding/config/Makefile.in
index 048b706696f..6d6710d7a59 100644
--- a/embedding/config/Makefile.in
+++ b/embedding/config/Makefile.in
@@ -57,12 +57,8 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
   _PLATFORM = dos
   WINAPP=mfcembed
   #WINAPP=winembed
-else
-ifdef MINIMO
-  BASEBROWSER = minimo-unix
 else
   BASEBROWSER = basebrowser-unix
-endif
   CLIENTMANIFEST = client-unix
   _PLATFORM = unix
 endif
@@ -101,9 +97,7 @@ endif
 	fi
 	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
 	$(NSINSTALL) -t $(srcdir)/readme.html $(DIST)/Embed
-ifndef MINIMO
 	-$(NSINSTALL) -t $(DEPTH)/embedding/lite/$(LIB_PREFIX)embed_lite$(DLL_SUFFIX) $(DIST)/Embed/components
-endif
 ifeq ($(OS_ARCH),WINNT)
 ifeq ($(WINAPP),mfcembed)
 	$(NSINSTALL) -t $(DIST)/bin/mfcembed.exe $(DIST)/Embed
diff --git a/js/src/xpconnect/Makefile.in b/js/src/xpconnect/Makefile.in
index 1dcde951423..40fc859789e 100644
--- a/js/src/xpconnect/Makefile.in
+++ b/js/src/xpconnect/Makefile.in
@@ -52,9 +52,7 @@ endif
 
 DIRS         += src
 
-ifndef MINIMO
 TOOL_DIRS    += shell
-endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS    += tests
diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in
index 1245ea34cf6..39bc9fa1a66 100644
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -56,13 +56,10 @@ DIRS  += standalone
 
 # Make this a true dynamic component even in static builds because
 # this component is shared by installer
-ifndef MINIMO
-# we don't care about the installer for MINIMO
 ifndef MOZ_ENABLE_LIBXUL
 BUILD_STATIC_LIBS=
 endif
 endif
-endif
 
 ifdef ENABLE_TESTS
 TOOL_DIRS += test
diff --git a/modules/plugin/Makefile.in b/modules/plugin/Makefile.in
index bcf00a8f265..5d016234e7e 100644
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -49,8 +49,6 @@ DIRS		= base/public
 ifdef MOZ_PLUGINS
 DIRS		+= base/src 
 
-ifndef MINIMO
-
 ifneq (,$(filter gtk2 ,$(MOZ_WIDGET_TOOLKIT)))
 TOOL_DIRS += samples/unixprinting
 endif
@@ -62,8 +60,6 @@ ifdef MOZ_ENABLE_GTK2
 TOOL_DIRS += samples/default/unix
 endif
 
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 TOOL_DIRS += samples/default/windows
 endif
diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in
index 208409cab69..7a4936b537c 100644
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -63,12 +63,10 @@ ifdef MOZ_CRASHREPORTER
 DIRS += crashreporter
 endif
 
-ifndef MINIMO
 DIRS += \
 	xre \
 	mozapps \
 	$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/toolkit/themes/gnomestripe/mozapps/jar.mn b/toolkit/themes/gnomestripe/mozapps/jar.mn
index 852e2dc93d6..b92f012787b 100644
--- a/toolkit/themes/gnomestripe/mozapps/jar.mn
+++ b/toolkit/themes/gnomestripe/mozapps/jar.mn
@@ -1,5 +1,4 @@
 classic.jar:
-#ifndef MINIMO
 + skin/classic/mozapps/update/update.png                   (update/update.png)
 + skin/classic/mozapps/update/updates.css                  (update/updates.css)
 + skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
@@ -20,4 +19,3 @@ classic.jar:
 + skin/classic/mozapps/places/defaultFavicon.png           (places/defaultFavicon.png)
 + skin/classic/mozapps/places/tagContainerIcon.png         (places/tagContainerIcon.png)
 #endif
-#endif
diff --git a/toolkit/themes/pinstripe/help/jar.mn b/toolkit/themes/pinstripe/help/jar.mn
index 46cc0616540..e7e04f8d2c8 100644
--- a/toolkit/themes/pinstripe/help/jar.mn
+++ b/toolkit/themes/pinstripe/help/jar.mn
@@ -1,8 +1,6 @@
 classic.jar:
 % skin help classic/1.0 %skin/classic/help/
-#ifndef MINIMO
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
   skin/classic/help/helpFileLayout.css
   skin/classic/help/Weblink.png
-#endif
diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn
index 47a92a336a9..ed6b3b67711 100755
--- a/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -1,6 +1,5 @@
 classic.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/
-#ifndef MINIMO
   skin/classic/mozapps/downloads/buttons.png                      (downloads/buttons.png)
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)
   skin/classic/mozapps/downloads/downloadStatusIcon.png           (downloads/downloadStatusIcon.png)
@@ -42,4 +41,3 @@ classic.jar:
   skin/classic/mozapps/places/tagContainerIcon.png                (places/tagContainerIcon.png)
 #endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
-#endif
diff --git a/toolkit/themes/winstripe/help/jar.mn b/toolkit/themes/winstripe/help/jar.mn
index bb2a50ddbba..a60ab3d7aa6 100644
--- a/toolkit/themes/winstripe/help/jar.mn
+++ b/toolkit/themes/winstripe/help/jar.mn
@@ -1,10 +1,8 @@
 classic.jar:
 % skin help classic/1.0 %skin/classic/help/
-#ifndef MINIMO
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
   skin/classic/help/Toolbar-rtl.png
   skin/classic/help/helpFileLayout.css
   skin/classic/help/Weblink.png
   skin/classic/help/Weblink-rtl.png
-#endif
diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in
index 7389b3b1d20..018cb73204b 100644
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -62,10 +62,8 @@ DIRS		= \
 		$(NULL)
 
 ifndef MOZ_ENABLE_LIBXUL
-ifndef MINIMO
 DIRS += stub
 endif
-endif
 
 TOOL_DIRS = \
 	tools \
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index 56bffe76354..1827a2687af 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -89,17 +89,13 @@ CPPSRCS		= \
 		nsXPCOMStrings.cpp \
 		$(NULL)
 
-ifndef MINIMO
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 CPPSRCS		+= dlldeps.cpp
 endif
-endif
 
-ifndef MINIMO
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),OS2)
 CPPSRCS		+= dlldeps.cpp
 endif
-endif
 
 ifdef XPCOM_USE_LEA
 CSRCS += malloc.c
@@ -150,10 +146,8 @@ EXPORTS	= \
 FORCE_USE_PIC	= 1 
 
 ifndef MOZ_ENABLE_LIBXUL
-ifndef MINIMO
 FORCE_SHARED_LIB = 1
 endif
-endif
 
 # UNIX98 iconv support
 OS_LIBS += $(LIBICONV)
diff --git a/xpcom/obsolete/component/Makefile.in b/xpcom/obsolete/component/Makefile.in
index a8a64ddaf90..c865e030219 100644
--- a/xpcom/obsolete/component/Makefile.in
+++ b/xpcom/obsolete/component/Makefile.in
@@ -49,9 +49,7 @@ ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= xpcomctc
 endif
 
-ifndef MINIMO
 EXPORT_LIBRARY  = 1
-endif
 IS_COMPONENT	= 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1