--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -3120,17 +3120,17 @@
         <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
 #endif
 #endif
        </menupopup>
       </menu>
 
 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../mozilla/toolkit/content/macWindowMenu.inc
+#includesubst @TOOLKIT_DIR@/content/macWindowMenu.inc
 #endif
 
       <!-- Help -->
       <menu id="helpMenu"/>
 
       <spacer id="menubar_spacer" flex="100%"/>
       </menubar>
     </toolbaritem>

--- a/mail/base/moz.build
+++ b/mail/base/moz.build
@@ -21,8 +21,10 @@ if CONFIG['MOZILLA_OFFICIAL']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
     DEFINES['HAVE_SHELL_SERVICE'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
 
 if CONFIG['MOZ_UPDATER']:
     DEFINES['MOZ_UPDATER'] = 1
+
+DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)

--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -596,17 +596,17 @@
                       command="cmd_preferences"/>
 #endif
 #endif
           </menupopup>
         </menu>
 
 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../../mozilla/toolkit/content/macWindowMenu.inc
+#includesubst @TOOLKIT_DIR@/content/macWindowMenu.inc
 #endif
 
       <!-- Help -->
       <menu id="helpMenu"/>
     </menubar>
    </toolbaritem>
   </toolbar>
 

--- a/mail/components/addrbook/moz.build
+++ b/mail/components/addrbook/moz.build
@@ -1,6 +1,8 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)

--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -727,17 +727,17 @@
                       oncommand="openOptionsDialog('paneCompose');"/>
 #endif
 #endif
          </menupopup>
       </menu>
 
 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../../mozilla/toolkit/content/macWindowMenu.inc
+#includesubst @TOOLKIT_DIR@/content/macWindowMenu.inc
 #endif
 
       <!-- Help -->
       <menu id="helpMenu"/>
     </menubar>
    </toolbaritem>
   </toolbar>
 

--- a/mail/components/compose/moz.build
+++ b/mail/components/compose/moz.build
@@ -1,6 +1,8 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+DEFINES['TOOLKIT_DIR'] = "%s/toolkit" % (CONFIG['moztopsrcdir'],)