diff --git a/src/array.h b/src/array.h
index 4337c356c0b54b61b263961f7b4f29aaa3023cb0..393d506f41078255e8a0810af273c71e38cf83eb 100644
--- a/src/array.h
+++ b/src/array.h
@@ -2,13 +2,13 @@
 || 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: array.h,v 1.52 2003/04/28 18:32:38 mast Exp $
+|| $Id: array.h,v 1.53 2003/11/14 11:15:14 mast Exp $
 */
 
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include "las.h"
+#include "svalue.h"
 
 /* This debug tool writes out messages whenever arrays with unfinished
  * type fields are encountered. */
diff --git a/src/mapping.h b/src/mapping.h
index 8c7dd52d4c6439d3a55a9fd7f64dc5858cc0e427..6bb6d9baf88bffd92bb7301a383d90e14e602ade 100644
--- a/src/mapping.h
+++ b/src/mapping.h
@@ -2,13 +2,13 @@
 || 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: mapping.h,v 1.50 2003/06/30 17:06:09 mast Exp $
+|| $Id: mapping.h,v 1.51 2003/11/14 11:15:14 mast Exp $
 */
 
 #ifndef MAPPING_H
 #define MAPPING_H
 
-#include "las.h"
+#include "svalue.h"
 #include "block_alloc_h.h"
 
 /* Compatible with PIKE_WEAK_INDICES and PIKE_WEAK_VALUES. */
diff --git a/src/multiset.h b/src/multiset.h
index 84b0fa5706c023d6b6c4855268af5dd7a08f7e99..b9922a99e98af74c239319f9e1ae4698f7d436d0 100644
--- a/src/multiset.h
+++ b/src/multiset.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: multiset.h,v 1.31 2003/01/11 00:01:20 mast Exp $
+|| $Id: multiset.h,v 1.32 2003/11/14 11:15:14 mast Exp $
 */
 
 #ifndef MULTISET_H
@@ -437,7 +437,7 @@ void test_multiset (void);
 
 #else  /* PIKE_NEW_MULTISETS */
 
-#include "las.h"
+#include "svalue.h"
 
 struct multiset
 {
diff --git a/src/pike_types.h b/src/pike_types.h
index 5a9f4d3c46bc56865f80b963a796b91c8e4d1fa4..e1508182597221af14aa89cc90259b225d7d2535 100644
--- a/src/pike_types.h
+++ b/src/pike_types.h
@@ -2,14 +2,13 @@
 || 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_types.h,v 1.91 2003/11/14 00:28:38 mast Exp $
+|| $Id: pike_types.h,v 1.92 2003/11/14 11:15:14 mast Exp $
 */
 
 #ifndef PIKE_TYPES_H
 #define PIKE_TYPES_H
 
 #include "svalue.h"
-#include "las.h"
 
 #define PIKE_TYPE_STACK_SIZE 100000
 
diff --git a/src/svalue.h b/src/svalue.h
index 0b2e38dca111e162a605c3242cc82ef3a302e36a..cd21ff4a3a348b00b07cea20ecdfba426705ff28 100644
--- a/src/svalue.h
+++ b/src/svalue.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: svalue.h,v 1.125 2003/11/04 18:16:40 grubba Exp $
+|| $Id: svalue.h,v 1.126 2003/11/14 11:15:14 mast Exp $
 */
 
 #ifndef SVALUE_H
@@ -45,6 +45,12 @@ struct pike_string;
 struct callable;
 #endif
 
+#ifndef STRUCT_NODE_S_DECLARED
+#define STRUCT_NODE_S_DECLARED
+struct node_s;
+typedef struct node_s node;
+#endif
+
 struct processing
 {
   struct processing *next;