diff --git a/src/docode.c b/src/docode.c
index 9c33473c2359953d20c77ab358cc400d3a6a7e22..b454487c9f1d85c0e0779736d3642107f8d99a26 100644
--- a/src/docode.c
+++ b/src/docode.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: docode.c,v 1.182 2004/12/18 18:21:57 grubba Exp $
+|| $Id: docode.c,v 1.183 2004/12/30 13:41:08 grubba Exp $
 */
 
 #include "global.h"
@@ -17,7 +17,7 @@
 #include "pike_error.h"
 #include "pike_memory.h"
 #include "svalue.h"
-#include "main.h"
+#include "pike_embed.h"
 #include "builtin_functions.h"
 #include "peep.h"
 #include "docode.h"
diff --git a/src/fsort.c b/src/fsort.c
index d7f35319efda380509c895faff6271d41275de15..2b3eba5e419b26bfdf040f251adbab4a5e75372c 100644
--- a/src/fsort.c
+++ b/src/fsort.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: fsort.c,v 1.23 2004/09/18 20:50:50 nilsson Exp $
+|| $Id: fsort.c,v 1.24 2004/12/30 13:41:08 grubba Exp $
 */
 
 /* fsort- a smarter quicksort /Hubbe */
@@ -11,7 +11,7 @@
 #include "global.h"
 #include "pike_error.h"
 #include "fsort.h"
-#include "main.h"
+#include "pike_embed.h"
 #include "pike_macros.h"
 
 #define CMP(X,Y) ( (*cmpfun)((void *)(X),(void *)(Y)) )
diff --git a/src/interpret.c b/src/interpret.c
index 88f6733a49fce5c70ecc3d5fcf538a7cef6c4c3b..537c7347f50ee8ea6102c82989e2d75be18ff53c 100644
--- a/src/interpret.c
+++ b/src/interpret.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: interpret.c,v 1.360 2004/12/22 18:46:15 grubba Exp $
+|| $Id: interpret.c,v 1.361 2004/12/30 13:44:20 grubba Exp $
 */
 
 #include "global.h"
@@ -20,7 +20,7 @@
 #include "backend.h"
 #include "operators.h"
 #include "opcodes.h"
-#include "main.h"
+#include "pike_embed.h"
 #include "lex.h"
 #include "builtin_functions.h"
 #include "signal_handler.h"
diff --git a/src/language.yacc b/src/language.yacc
index 74c9881f49dd73cebf86fbb68e560d028dd9fc76..8c11e2c8858fddc7bf2e39db72efc931f2347ea5 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: language.yacc,v 1.352 2004/12/22 18:46:15 grubba Exp $
+|| $Id: language.yacc,v 1.353 2004/12/30 13:41:08 grubba Exp $
 */
 
 %pure_parser
@@ -132,7 +132,7 @@
 #include "pike_error.h"
 #include "docode.h"
 #include "machine.h"
-#include "main.h"
+#include "pike_embed.h"
 #include "opcodes.h"
 #include "operators.h"
 #include "bignum.h"
diff --git a/src/opcodes.c b/src/opcodes.c
index b2a1a6b0071214e20ee9b5213a13bc9c2eafaf1e..f7d65353a68051d9c4936330171a2089fe88a5ee 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -2,14 +2,14 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: opcodes.c,v 1.165 2004/09/30 14:09:07 mast Exp $
+|| $Id: opcodes.c,v 1.166 2004/12/30 13:41:08 grubba Exp $
 */
 
 #include "global.h"
 #include "constants.h"
 #include "interpret.h"
 #include "opcodes.h"
-#include "main.h"
+#include "pike_embed.h"
 
 #ifdef INSTR_PROFILING
 
diff --git a/src/peep.c b/src/peep.c
index fa63faf7afb2c40e73ca79f4e6ba2fa049250bdf..89e5f5f3678c63673997c3721b002d8c6f0e9b48 100644
--- a/src/peep.c
+++ b/src/peep.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: peep.c,v 1.104 2004/09/18 20:50:53 nilsson Exp $
+|| $Id: peep.c,v 1.105 2004/12/30 13:41:08 grubba Exp $
 */
 
 #include "global.h"
@@ -11,7 +11,7 @@
 #include "program.h"
 #include "las.h"
 #include "docode.h"
-#include "main.h"
+#include "pike_embed.h"
 #include "pike_error.h"
 #include "lex.h"
 #include "pike_memory.h"
diff --git a/src/pike_threadlib.h b/src/pike_threadlib.h
index cf521cb467f5ff91de2d17e612eca0b82a75a14f..be919980a4b397f8cc21d579e57a99e4fdfc7376 100644
--- a/src/pike_threadlib.h
+++ b/src/pike_threadlib.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_threadlib.h,v 1.57 2004/09/13 11:49:35 grubba Exp $
+|| $Id: pike_threadlib.h,v 1.58 2004/12/30 13:41:08 grubba Exp $
 */
 
 #ifndef PIKE_THREADLIB_H
@@ -17,7 +17,7 @@
 
 #ifndef CONFIGURE_TEST
 #include "machine.h"
-#include "main.h"
+#include "pike_embed.h"
 #include "pike_rusage.h"
 #endif