diff --git a/src/errors.h b/src/errors.h
index 2a2f487bdbf4ad646421ebdb68733a55f7f200d9..8b81f3d83e7601c76f44d4477466d822cd29c38e 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -79,20 +79,20 @@ DECLARE_ERROR(generic, EMPTY ,
 
 DECLARE_ERROR(index,
 	      ERR_INHERIT(generic),
-  ERR_VAR(struct svalue, mixed, T_MIXED, val)
-  ERR_VAR(struct svalue, mixed, T_MIXED, ind)
+  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, val)
+  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, ind)
 )
 
 DECLARE_ERROR(bad_arg,
 	      ERR_INHERIT(generic),
   ERR_VAR(INT_TYPE, int, PIKE_T_INT, which_arg)
   ERR_VAR(struct pike_string *,string,PIKE_T_STRING,expected_type)
-  ERR_VAR(struct svalue, mixed, T_MIXED, got)
+  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, got)
 )
 
 DECLARE_ERROR(math,
 	      ERR_INHERIT(generic),
-  ERR_VAR(struct svalue, mixed, T_MIXED, number)
+  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, number)
 )
 
 DECLARE_ERROR(resource,
diff --git a/src/interpret_functions.h b/src/interpret_functions.h
index dde1ce0097d1b5580a8354cd43b315d5e075f540..ae419e21662df2cbfca8dfed948a89228698171e 100644
--- a/src/interpret_functions.h
+++ b/src/interpret_functions.h
@@ -1,5 +1,5 @@
 /*
- * $Id: interpret_functions.h,v 1.26 2000/07/12 12:25:18 grubba Exp $
+ * $Id: interpret_functions.h,v 1.27 2000/07/29 06:31:06 hubbe Exp $
  *
  * Opcode definitions for the interpreter.
  */
@@ -273,7 +273,7 @@ OPCODE2(F_LOCAL_2_GLOBAL, "global = local")
   i = ID_FROM_INT(Pike_fp->current_object->prog, tmp);
   if(!IDENTIFIER_IS_VARIABLE(i->identifier_flags))
     error("Cannot assign functions or constants.\n");
-  if(i->run_time_type == T_MIXED)
+  if(i->run_time_type == PIKE_T_MIXED)
   {
     assign_svalue((struct svalue *)GLOBAL_FROM_INT(tmp),
 		  Pike_fp->locals + arg2);
@@ -541,7 +541,7 @@ OPCODE1(F_GLOBAL_LVALUE, "& global")
   if(!IDENTIFIER_IS_VARIABLE(i->identifier_flags))
     error("Cannot re-assign functions or constants.\n");
 
-  if(i->run_time_type == T_MIXED)
+  if(i->run_time_type == PIKE_T_MIXED)
   {
     Pike_sp[0].type=T_LVALUE;
     Pike_sp[0].u.lval=(struct svalue *)GLOBAL_FROM_INT(tmp);
@@ -736,7 +736,7 @@ OPCODE1(F_ASSIGN_GLOBAL, "assign global")
   i=ID_FROM_INT(Pike_fp->current_object->prog, tmp);
   if(!IDENTIFIER_IS_VARIABLE(i->identifier_flags))
     error("Cannot assign functions or constants.\n");
-  if(i->run_time_type == T_MIXED)
+  if(i->run_time_type == PIKE_T_MIXED)
   {
     assign_svalue((struct svalue *)GLOBAL_FROM_INT(tmp), Pike_sp-1);
   }else{
@@ -758,7 +758,7 @@ OPCODE1(F_ASSIGN_GLOBAL_AND_POP, "assign global and pop")
   if(!IDENTIFIER_IS_VARIABLE(i->identifier_flags))
     error("Cannot assign functions or constants.\n");
 
-  if(i->run_time_type == T_MIXED)
+  if(i->run_time_type == PIKE_T_MIXED)
   {
     struct svalue *s=(struct svalue *)GLOBAL_FROM_INT(tmp);
     free_svalue(s);
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index 995f8818955a6d81215cd57f27a3a89806fdcd63..4ebc9d4068bfc759f3882e824ae7478b423b448e 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -4,8 +4,9 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 /**/
+#define NO_PIKE_SHORTHAND
 #include "global.h"
-RCSID("$Id: file.c,v 1.181 2000/07/21 18:54:15 grubba Exp $");
+RCSID("$Id: file.c,v 1.182 2000/07/29 06:31:14 hubbe Exp $");
 #include "fdlib.h"
 #include "interpret.h"
 #include "svalue.h"
@@ -183,14 +184,14 @@ static void init_fd(int fd, int open_mode)
   REMOVE_INTERNAL_REFERENCE(THIS);
   THIS->flags=0;
   THIS->open_mode=open_mode;
-  THIS->read_callback.type=T_INT;
+  THIS->read_callback.type=PIKE_T_INT;
   THIS->read_callback.u.integer=0;
-  THIS->write_callback.type=T_INT;
+  THIS->write_callback.type=PIKE_T_INT;
   THIS->write_callback.u.integer=0;
 #ifdef WITH_OOB
-  THIS->read_oob_callback.type=T_INT;
+  THIS->read_oob_callback.type=PIKE_T_INT;
   THIS->read_oob_callback.u.integer=0;
-  THIS->write_oob_callback.type=T_INT;
+  THIS->write_oob_callback.type=PIKE_T_INT;
   THIS->write_oob_callback.u.integer=0;
 #endif /* WITH_OOB */
 #if defined(HAVE_FD_FLOCK) || defined(HAVE_FD_LOCKF)
@@ -202,14 +203,14 @@ static void init_fd(int fd, int open_mode)
 void reset_variables(void)
 {
   free_svalue(& THIS->read_callback);
-  THIS->read_callback.type=T_INT;
+  THIS->read_callback.type=PIKE_T_INT;
   free_svalue(& THIS->write_callback);
-  THIS->write_callback.type=T_INT;
+  THIS->write_callback.type=PIKE_T_INT;
 #ifdef WITH_OOB
   free_svalue(& THIS->read_oob_callback);
-  THIS->read_oob_callback.type=T_INT;
+  THIS->read_oob_callback.type=PIKE_T_INT;
   free_svalue(& THIS->write_oob_callback);
-  THIS->write_oob_callback.type=T_INT;
+  THIS->write_oob_callback.type=PIKE_T_INT;
 #endif /* WITH_OOB */
 }
 
@@ -652,7 +653,7 @@ static void file_read(INT32 args)
   }
   else
   {
-    if(Pike_sp[-args].type != T_INT)
+    if(Pike_sp[-args].type != PIKE_T_INT)
       error("Bad argument 1 to file->read().\n");
     len=Pike_sp[-args].u.integer;
     if(len<0)
@@ -756,7 +757,7 @@ static void file_read_oob(INT32 args)
   }
   else
   {
-    if(Pike_sp[-args].type != T_INT)
+    if(Pike_sp[-args].type != PIKE_T_INT)
       error("Bad argument 1 to file->read_oob().\n");
     len=Pike_sp[-args].u.integer;
     if(len<0)
@@ -875,7 +876,7 @@ static void file_write(INT32 args)
   INT32 written,i;
   struct pike_string *str;
 
-  if(args<1 || ((Pike_sp[-args].type != T_STRING) && (Pike_sp[-args].type != T_ARRAY)))
+  if(args<1 || ((Pike_sp[-args].type != PIKE_T_STRING) && (Pike_sp[-args].type != PIKE_T_ARRAY)))
     error("Bad argument 1 to file->write().\n"
 	  "Type is %s. Expected string or array(string)\n",
 	  get_name_of_type(Pike_sp[-args].type));
@@ -883,11 +884,11 @@ static void file_write(INT32 args)
   if(FD < 0)
     error("File not open for write.\n");
 
-  if (Pike_sp[-args].type == T_ARRAY) {
+  if (Pike_sp[-args].type == PIKE_T_ARRAY) {
     struct array *a = Pike_sp[-args].u.array;
     i = a->size;
     while(i--) {
-      if (a->item[i].type != T_STRING) {
+      if (a->item[i].type != PIKE_T_STRING) {
 	error("Bad argument 1 to file->write().\n"
 	      "Element %d is not a string.\n",
 	      i);
@@ -909,7 +910,7 @@ static void file_write(INT32 args)
       assign_svalue(Pike_sp-args, Pike_sp);
 
 #ifdef PIKE_DEBUG
-      if (Pike_sp[-args].type != T_STRING) {
+      if (Pike_sp[-args].type != PIKE_T_STRING) {
 	error("Bad return value from string multiplication.");
       }
 #endif /* PIKE_DEBUG */
@@ -1018,7 +1019,7 @@ static void file_write(INT32 args)
 #endif /* HAVE_WRITEV */
   }
 
-  /* At this point Pike_sp[-args].type is T_STRING */
+  /* At this point Pike_sp[-args].type is PIKE_T_STRING */
 
   if(args > 1)
   {
@@ -1088,7 +1089,7 @@ static void file_write_oob(INT32 args)
   INT32 written,i;
   struct pike_string *str;
 
-  if(args<1 || Pike_sp[-args].type != T_STRING)
+  if(args<1 || Pike_sp[-args].type != PIKE_T_STRING)
     error("Bad argument 1 to file->write().\n");
 
   if(args > 1)
@@ -1217,7 +1218,7 @@ static void file_close(INT32 args)
   int flags;
   if(args)
   {
-    if(Pike_sp[-args].type != T_STRING)
+    if(Pike_sp[-args].type != PIKE_T_STRING)
       error("Bad argument 1 to file->close()\n");
     flags=parse(Pike_sp[-args].u.string->str);
   }else{
@@ -1251,16 +1252,16 @@ static void file_open(INT32 args)
   if(args < 2)
     error("Too few arguments to file->open()\n");
 
-  if(Pike_sp[-args].type != T_STRING &&
-     Pike_sp[-args].type != T_INT)
+  if(Pike_sp[-args].type != PIKE_T_STRING &&
+     Pike_sp[-args].type != PIKE_T_INT)
     error("Bad argument 1 to file->open()\n");
 
-  if(Pike_sp[1-args].type != T_STRING)
+  if(Pike_sp[1-args].type != PIKE_T_STRING)
     error("Bad argument 2 to file->open()\n");
 
   if (args > 2)
   {
-    if (Pike_sp[2-args].type != T_INT)
+    if (Pike_sp[2-args].type != PIKE_T_INT)
       error("Bad argument 3 to file->open()\n");
     access = Pike_sp[2-args].u.integer;
   } else
@@ -1268,7 +1269,7 @@ static void file_open(INT32 args)
 
   flags = parse((flag_str = Pike_sp[1-args].u.string)->str);
 
-  if (Pike_sp[-args].type==T_STRING)
+  if (Pike_sp[-args].type==PIKE_T_STRING)
   {
      str=Pike_sp[-args].u.string;
 
@@ -1297,7 +1298,7 @@ static void file_open(INT32 args)
 	safe_apply(OBJ2CREDS(Pike_interpreter.current_creds)->user,"valid_open",5);
 	switch(Pike_sp[-1].type)
 	{
-	   case T_INT:
+	   case PIKE_T_INT:
 	      switch(Pike_sp[-1].u.integer)
 	      {
 		 case 0: /* return 0 */
@@ -1326,7 +1327,7 @@ static void file_open(INT32 args)
 	   default:
 	      error("Error in user->valid_open, wrong return type.\n");
 
-	   case T_STRING:
+	   case PIKE_T_STRING:
 	      str=Pike_sp[-1].u.string;
 	      args++;
 	}
@@ -1409,7 +1410,7 @@ static void file_seek(INT32 args)
   else
 #endif /* AUTO_BIGNUM */
 #endif
-  if(args<1 || Pike_sp[-args].type != T_INT)
+  if(args<1 || Pike_sp[-args].type != PIKE_T_INT)
     error("Bad argument 1 to file->seek(int to).\n");
   else
     to=Pike_sp[-args].u.integer;
@@ -1419,13 +1420,13 @@ static void file_seek(INT32 args)
 
   if(args>1)
   {
-    if(Pike_sp[-args+1].type != T_INT)
+    if(Pike_sp[-args+1].type != PIKE_T_INT)
       error("Bad argument 2 to file->seek(int unit,int mult).\n");
     to *= Pike_sp[-args+1].u.integer;
   }
   if(args>2)
   {
-    if(Pike_sp[-args+2].type != T_INT)
+    if(Pike_sp[-args+2].type != PIKE_T_INT)
       error("Bad argument 3 to file->seek(int unit,int mult,int add).\n");
     to += Pike_sp[-args+2].u.integer;
   }
@@ -1476,7 +1477,7 @@ static void file_truncate(INT32 args)
 #endif
   int res;
 
-  if(args<1 || Pike_sp[-args].type != T_INT)
+  if(args<1 || Pike_sp[-args].type != PIKE_T_INT)
     error("Bad argument 1 to file->truncate(int length).\n");
 
   if(FD < 0)
@@ -1611,7 +1612,7 @@ static void file_set_buffer(INT32 args)
     error("file->set_buffer() on closed file.\n");
   if(!args)
     error("Too few arguments to file->set_buffer()\n");
-  if(Pike_sp[-args].type!=T_INT)
+  if(Pike_sp[-args].type!=PIKE_T_INT)
     error("Bad argument 1 to file->set_buffer()\n");
 
   bufsize=Pike_sp[-args].u.integer;
@@ -1620,7 +1621,7 @@ static void file_set_buffer(INT32 args)
 
   if(args>1)
   {
-    if(Pike_sp[1-args].type != T_STRING)
+    if(Pike_sp[1-args].type != PIKE_T_STRING)
       error("Bad argument 2 to file->set_buffer()\n");
     flags=parse(Pike_sp[1-args].u.string->str);
   }else{
@@ -2016,7 +2017,7 @@ static void file_dup2(INT32 args)
   if(FD < 0)
     error("File not open.\n");
 
-  if(Pike_sp[-args].type != T_OBJECT)
+  if(Pike_sp[-args].type != PIKE_T_OBJECT)
     error("Bad argument 1 to file->dup2()\n");
 
   o=Pike_sp[-args].u.object;
@@ -2094,12 +2095,12 @@ static void file_open_socket(INT32 args)
     struct sockaddr_in addr;
     int o;
 
-    if (Pike_sp[-args].type != T_INT) {
+    if (Pike_sp[-args].type != PIKE_T_INT) {
       fd_close(fd);
       error("Bad argument 1 to open_socket(), expected int\n");
     }
     if (args > 1) {
-      if (Pike_sp[1-args].type != T_STRING) {
+      if (Pike_sp[1-args].type != PIKE_T_STRING) {
 	fd_close(fd);
 	error("Bad argument 2 to open_socket(), expected string\n");
       }
@@ -2289,7 +2290,7 @@ static void file_lsh(INT32 args)
   if(args != 1)
     error("Too few/many args to file->`<<\n");
 
-  if(Pike_sp[-1].type != T_STRING)
+  if(Pike_sp[-1].type != PIKE_T_STRING)
   {
     ref_push_string(string_type_string);
     stack_swap();
@@ -2307,8 +2308,8 @@ static void file_lsh(INT32 args)
 static void file_create(INT32 args)
 {
   if(!args) return;
-  if(Pike_sp[-args].type != T_STRING &&
-     Pike_sp[-args].type != T_INT)
+  if(Pike_sp[-args].type != PIKE_T_STRING &&
+     Pike_sp[-args].type != PIKE_T_INT)
     error("Bad argument 1 to file->create()\n");
 
   close_fd();
@@ -2413,7 +2414,7 @@ void create_proxy_pipe(struct object *o, int for_reading)
   push_object(n=clone_object(file_program,0));
   push_int(fd_INTERPROCESSABLE);
   apply(n,"pipe",1);
-  if(Pike_sp[-1].type!=T_OBJECT)
+  if(Pike_sp[-1].type!=PIKE_T_OBJECT)
     error("Failed to create proxy pipe (errno=%d)!\n",get_file_storage(n)->my_errno);
   n2=Pike_sp[-1].u.object;
   /* Stack is now: pipe(read), pipe(write) */
@@ -2567,7 +2568,7 @@ static void init_file_locking(void)
 #ifdef _REENTRANT
   map_variable("_owner","object",0,
 	       off + OFFSETOF(file_lock_key_storage, owner),
-	       T_OBJECT);
+	       PIKE_T_OBJECT);
 #endif
   set_init_callback(init_file_lock_key);
   set_exit_callback(exit_file_lock_key);
@@ -2684,13 +2685,13 @@ void pike_module_init(void)
   START_NEW_PROGRAM_ID(STDIO_FD);
   ADD_STORAGE(struct my_file);
 
-#define FILE_FUNC(X,Y,Z) PIKE_CONCAT(Y,_function_number)=add_function(X,Y,Z,0);
+#define FILE_FUNC(X,Y,Z) PIKE_CONCAT(Y,_function_number)=pike_add_function(X,Y,Z,0);
 #include "file_functions.h"
-  map_variable("_read_callback","mixed",0,OFFSETOF(my_file, read_callback),T_MIXED);
-  map_variable("_write_callback","mixed",0,OFFSETOF(my_file, write_callback),T_MIXED);
+  map_variable("_read_callback","mixed",0,OFFSETOF(my_file, read_callback),PIKE_T_MIXED);
+  map_variable("_write_callback","mixed",0,OFFSETOF(my_file, write_callback),PIKE_T_MIXED);
 #ifdef WITH_OOB
-  map_variable("_read_oob_callback","mixed",0,OFFSETOF(my_file, read_oob_callback),T_MIXED);
-  map_variable("_write_oob_callback","mixed",0,OFFSETOF(my_file, write_oob_callback),T_MIXED);
+  map_variable("_read_oob_callback","mixed",0,OFFSETOF(my_file, read_oob_callback),PIKE_T_MIXED);
+  map_variable("_write_oob_callback","mixed",0,OFFSETOF(my_file, write_oob_callback),PIKE_T_MIXED);
 #endif
 
 
@@ -2721,9 +2722,9 @@ void pike_module_init(void)
 
   start_new_program();
   ADD_STORAGE(struct object *);
-  map_variable("_fd","object",0,0,T_OBJECT);
+  map_variable("_fd","object",0,0,PIKE_T_OBJECT);
 
-#define FILE_FUNC(X,Y,Z) add_function(X,PIKE_CONCAT(Y,_ref),Z,0);
+#define FILE_FUNC(X,Y,Z) pike_add_function(X,PIKE_CONCAT(Y,_ref),Z,0);
 #include "file_functions.h"
 
   file_ref_program=end_program();
diff --git a/src/pike_types.h b/src/pike_types.h
index 3012cb8a49700c886abe29bea1807beac294a0ba..fb839b0f639330845cecaba05e132202af3b93bd 100644
--- a/src/pike_types.h
+++ b/src/pike_types.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: pike_types.h,v 1.39 2000/06/24 00:48:13 hubbe Exp $
+ * $Id: pike_types.h,v 1.40 2000/07/29 06:31:06 hubbe Exp $
  */
 #ifndef PIKE_TYPES_H
 #define PIKE_TYPES_H
@@ -219,8 +219,8 @@ struct pike_string *make_pike_type(char *t);
 #define dtOr4(A,B,C,D) dtOr(A,dtOr3(B,C,D))
 #define dtOr5(A,B,C,D,E) dtOr(A,dtOr4(B,C,D,E))
 #define dtOr6(A,B,C,D,E,F) dtOr(A,dtOr5(B,C,D,E,F))
-#define dtMix {unsafe_push_type(T_MIXED);}
-#define dtMixed {unsafe_push_type(T_MIXED);}
+#define dtMix {unsafe_push_type(PIKE_T_MIXED);}
+#define dtMixed {unsafe_push_type(PIKE_T_MIXED);}
 #define dtComplex dtStore(tComplex)
 #define dtStringIndicable dtStore(tStringIndicable)
 #define dtRef dtStore(tRef)
diff --git a/src/svalue.h b/src/svalue.h
index d1e3b61861ee2cc0dfcbc8c6852c49fd94c58ea5..9a2e18d2d732ea0fc04381bc5ed2101666fa68d9 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: svalue.h,v 1.62 2000/07/28 17:16:55 hubbe Exp $
+ * $Id: svalue.h,v 1.63 2000/07/29 06:31:07 hubbe Exp $
  */
 #ifndef SVALUE_H
 #define SVALUE_H
@@ -103,7 +103,7 @@ struct svalue
 #define T_SHORT_LVALUE 248
 #define T_LVALUE 249
 #define T_ARRAY_LVALUE 250
-#define T_MIXED 251
+#define PIKE_T_MIXED 251
 #define T_NOT 253
 #define T_AND 254
 #define T_OR 255
@@ -420,6 +420,7 @@ PMOD_EXPORT INT32 pike_sizeof(struct svalue *s);
 
 #define T_TUPLE	   PIKE_T_TUPLE
 #define T_SCOPE	   PIKE_T_SCOPE
+#define T_MIXED    PIKE_T_MIXED
 
 #endif /* !NO_PIKE_SHORTHAND */