diff --git a/src/encode.c b/src/encode.c
index b1e902b36bf6f7bf70f90b8f8faecccb012758f1..e199eba38e809356ab0fea7fa6fcd58cb5356a2e 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -25,7 +25,7 @@
 #include "version.h"
 #include "bignum.h"
 
-RCSID("$Id: encode.c,v 1.75 2000/10/02 21:59:20 hubbe Exp $");
+RCSID("$Id: encode.c,v 1.76 2000/10/04 05:12:12 hubbe Exp $");
 
 /* #define ENCODE_DEBUG */
 
@@ -324,7 +324,7 @@ one_more_type:
     case T_MIXED:
     case T_ZERO:
     case T_VOID:
-    case T_UNKNOWN:
+    case PIKE_T_UNKNOWN:
       break;
 
     case T_OBJECT:
@@ -1017,7 +1017,7 @@ one_more_type:
     case T_MIXED:
     case T_ZERO:
     case T_VOID:
-    case T_UNKNOWN:
+    case PIKE_T_UNKNOWN:
       break;
 
     case T_OBJECT:
diff --git a/src/gc.c b/src/gc.c
index 9b03c0e47d263bcb9dc1a97e534d9dde523f7332..70f75d2fa858ad4689b2c88f490f54030a1723d0 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -30,7 +30,7 @@ struct callback *gc_evaluator_callback=0;
 
 #include "block_alloc.h"
 
-RCSID("$Id: gc.c,v 1.139 2000/09/30 19:21:44 mast Exp $");
+RCSID("$Id: gc.c,v 1.140 2000/10/04 05:12:12 hubbe Exp $");
 
 /* Run garbage collect approximately every time
  * 20 percent of all arrays, objects and programs is
@@ -285,7 +285,7 @@ TYPE_T attempt_to_identify(void *something)
   if(safe_debug_findstring((struct pike_string *)something))
     return T_STRING;
 
-  return T_UNKNOWN;
+  return PIKE_T_UNKNOWN;
 }
 
 void *check_for =0;
@@ -327,7 +327,7 @@ void describe_location(void *real_memblock,
   }
 #endif
 
-  if(type==T_UNKNOWN)
+  if(type==PIKE_T_UNKNOWN)
     type=attempt_to_identify(memblock);
 
   if(memblock)
@@ -348,7 +348,7 @@ void describe_location(void *real_memblock,
  again:
   switch(type)
   {
-    case T_UNKNOWN:
+    case PIKE_T_UNKNOWN:
       for(p=first_program;p;p=p->next)
       {
 	if(memblock == (void *)p->program)
@@ -552,7 +552,7 @@ void debug_gc_xmark_svalues(struct svalue *s, ptrdiff_t num, char *fromwhere)
   found_in=(void *)fromwhere;
   found_in_type=-1;
   gc_xmark_svalues(s,num);
-  found_in_type=T_UNKNOWN;
+  found_in_type=PIKE_T_UNKNOWN;
   found_in=0;
 }
 
@@ -561,7 +561,7 @@ void debug_gc_check_svalues(struct svalue *s, ptrdiff_t num, TYPE_T t, void *dat
   found_in=data;
   found_in_type=t;
   gc_check_svalues(s,num);
-  found_in_type=T_UNKNOWN;
+  found_in_type=PIKE_T_UNKNOWN;
   found_in=0;
 }
 
@@ -570,7 +570,7 @@ void debug_gc_check_weak_svalues(struct svalue *s, ptrdiff_t num, TYPE_T t, void
   found_in=data;
   found_in_type=t;
   gc_check_weak_svalues(s,num);
-  found_in_type=T_UNKNOWN;
+  found_in_type=PIKE_T_UNKNOWN;
   found_in=0;
 }
 
@@ -579,7 +579,7 @@ void debug_gc_check_short_svalue(union anything *u, TYPE_T type, TYPE_T t, void
   found_in=data;
   found_in_type=t;
   gc_check_short_svalue(u,type);
-  found_in_type=T_UNKNOWN;
+  found_in_type=PIKE_T_UNKNOWN;
   found_in=0;
 }
 
@@ -588,7 +588,7 @@ void debug_gc_check_weak_short_svalue(union anything *u, TYPE_T type, TYPE_T t,
   found_in=data;
   found_in_type=t;
   gc_check_weak_short_svalue(u,type);
-  found_in_type=T_UNKNOWN;
+  found_in_type=PIKE_T_UNKNOWN;
   found_in=0;
 }
 
@@ -598,7 +598,7 @@ int debug_low_gc_check(void *x, TYPE_T t, void *data)
   found_in=data;
   found_in_type=t;
   ret=gc_check(x);
-  found_in_type=T_UNKNOWN;
+  found_in_type=PIKE_T_UNKNOWN;
   found_in=0;
   return ret;
 }
diff --git a/src/pike_memory.c b/src/pike_memory.c
index 645eb3a6be871a378f44c091ce4a6c0aaa26b0eb..535ccfbfe1df2a06ddc2c1e169c930f1935a6002 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -10,7 +10,7 @@
 #include "pike_macros.h"
 #include "gc.h"
 
-RCSID("$Id: pike_memory.c,v 1.88 2000/09/11 18:47:02 grubba Exp $");
+RCSID("$Id: pike_memory.c,v 1.89 2000/10/04 05:12:13 hubbe Exp $");
 
 /* strdup() is used by several modules, so let's provide it */
 #ifndef HAVE_STRDUP
@@ -1634,7 +1634,7 @@ static void find_references_to(void *block, int indent, int depth, int flags)
 	    if(p[e] == block)
 	    {
 /*	      fprintf(stderr,"  <from %p word %d>\n",p,e); */
-	      describe_location(p,T_UNKNOWN,p+e, indent,depth,flags);
+	      describe_location(p,PIKE_T_UNKNOWN,p+e, indent,depth,flags);
 
 /*	      low_dmalloc_describe_location(m, e * sizeof(void *), indent); */
 
diff --git a/src/pike_types.c b/src/pike_types.c
index 62868fde64c5a3668e1b7021ac49e07610aa1a7d..3c75f67fb33d6be9f3aea51d915c61dcfdc8344f 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: pike_types.c,v 1.140 2000/09/10 17:24:00 grubba Exp $");
+RCSID("$Id: pike_types.c,v 1.141 2000/10/04 05:12:13 hubbe Exp $");
 #include <ctype.h>
 #include "svalue.h"
 #include "pike_types.h"
@@ -55,7 +55,7 @@ static int low_check_indexing(char *type, char *index_type, node *n);
  * T_FUNCTION <arg type> <arg type> ... <arg type> T_MANY <arg type> <return type>
  * note that the type after T_MANY can be T_VOID
  * T_MIXED matches anything except T_VOID
- * T_UNKNOWN only matches T_MIXED and T_UNKNOWN
+ * PIKE_T_UNKNOWN only matches T_MIXED and PIKE_T_UNKNOWN
  * objects are coded thus:
  * T_OBJECT <0/1> <program_id>
  *           ^
@@ -190,7 +190,7 @@ one_more_type:
     case T_MIXED:
     case T_VOID:
     case T_ZERO:
-    case T_UNKNOWN:
+    case PIKE_T_UNKNOWN:
       break;
 
     case T_INT:
@@ -595,7 +595,7 @@ static void internal_parse_typeA(char **_s)
       goto bad_type;
 
     case 'u':
-      if(!strcmp(buf,"unknown")) { push_type(T_UNKNOWN); break; }
+      if(!strcmp(buf,"unknown")) { push_type(PIKE_T_UNKNOWN); break; }
       goto bad_type;
 
     case 'a':
@@ -796,7 +796,7 @@ void stupid_describe_type(char *a, ptrdiff_t len)
       case T_MAPPING: printf("mapping"); break;
       case T_MULTISET: printf("multiset"); break;
 	
-      case T_UNKNOWN: printf("unknown"); break;
+      case PIKE_T_UNKNOWN: printf("unknown"); break;
       case T_MANY: printf("many"); break;
       case T_OR: printf("or"); break;
       case T_AND: printf("and"); break;
@@ -853,7 +853,7 @@ char *low_describe_type(char *t)
     case T_VOID: my_strcat("void"); break;
     case T_ZERO: my_strcat("zero"); break;
     case T_MIXED: my_strcat("mixed"); break;
-    case T_UNKNOWN: my_strcat("unknown"); break;
+    case PIKE_T_UNKNOWN: my_strcat("unknown"); break;
     case T_INT:
     {
       INT32 min=extract_type_int(t);
diff --git a/src/program.c b/src/program.c
index bf13a1fe2a8ece9f9e2eea5b3c62e1a70a4720f8..e8155801b55d0242edd722820fc1277869d24412 100644
--- a/src/program.c
+++ b/src/program.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: program.c,v 1.274 2000/10/01 08:51:54 hubbe Exp $");
+RCSID("$Id: program.c,v 1.275 2000/10/04 05:12:13 hubbe Exp $");
 #include "program.h"
 #include "object.h"
 #include "dynamic_buffer.h"
@@ -3593,7 +3593,7 @@ static void exit_trampoline(struct object *o)
 static void gc_check_frame(struct pike_frame *f)
 {
   if(!f) return;
-  if(!debug_gc_check(f,T_UNKNOWN,f) && f->malloced_locals)
+  if(!debug_gc_check(f,PIKE_T_UNKNOWN,f) && f->malloced_locals)
   {
     if(f->current_object) gc_check(f->current_object);
     if(f->context.prog)   gc_check(f->context.prog);
diff --git a/src/svalue.h b/src/svalue.h
index 6021e58f7726d7701f42d5abebdd0bf20ecaac7a..065df64cd33b3d81048479fed241a8ba247327e6 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: svalue.h,v 1.69 2000/09/26 02:42:41 hedda Exp $
+ * $Id: svalue.h,v 1.70 2000/10/04 05:12:14 hubbe Exp $
  */
 #ifndef SVALUE_H
 #define SVALUE_H
@@ -100,7 +100,7 @@ struct svalue
 #define PIKE_T_TUPLE 244	/* Not supported yet */
 #define T_ASSIGN 245
 #define T_DELETED 246
-#define T_UNKNOWN 247
+#define PIKE_T_UNKNOWN 247
 #define T_SHORT_LVALUE 248
 #define T_LVALUE 249
 #define T_ARRAY_LVALUE 250