diff --git a/src/interpret.h b/src/interpret.h
index 2a5edd0cc245906474800fa64aab0c776b5771c5..9dc7a8e15f6b826326f2486910268f4617d44cd2 100644
--- a/src/interpret.h
+++ b/src/interpret.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: interpret.h,v 1.92 2001/07/08 18:54:53 grubba Exp $
+ * $Id: interpret.h,v 1.93 2001/07/08 20:52:15 grubba Exp $
  */
 #ifndef INTERPRET_H
 #define INTERPRET_H
@@ -14,17 +14,6 @@
 #include "program.h"
 #include "pike_error.h"
 
-#ifdef HAVE_COMPUTED_GOTO
-#define PIKE_OPCODE_T	void *
-extern PIKE_OPCODE_T *fcode_to_opcode;
-#else /* !HAVE_COMPUTED_GOTO */
-#ifdef SHORT_PIKE_OPCODE
-#define PIKE_OPCODE_T	unsigned INT16
-#else /* !SHORT_PIKE_OPCODE */
-#define PIKE_OPCODE_T	unsigned INT8
-#endif /* SHORT_PIKE_OPCODE */
-#endif /* HAVE_COMPUTED_GOTO */
-
 struct Pike_interpreter {
   /* Swapped variables */
   struct svalue *stack_pointer;
diff --git a/src/program.h b/src/program.h
index 8d6a0c4b1e4afbdf09d90f641a2b6a9957ebf91e..8e658f432b0a12f116f9fbeb93c1bae52b3bbc83 100644
--- a/src/program.h
+++ b/src/program.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: program.h,v 1.133 2001/07/03 17:01:48 grubba Exp $
+ * $Id: program.h,v 1.134 2001/07/08 20:52:14 grubba Exp $
  */
 #ifndef PROGRAM_H
 #define PROGRAM_H
@@ -27,6 +27,16 @@
 /* Needed to support dynamic loading on NT */
 PMOD_PROTO extern struct program_state * Pike_compiler;
 
+#ifdef HAVE_COMPUTED_GOTO
+#define PIKE_OPCODE_T	void *
+extern PIKE_OPCODE_T *fcode_to_opcode;
+#else /* !HAVE_COMPUTED_GOTO */
+#ifdef SHORT_PIKE_OPCODE
+#define PIKE_OPCODE_T	unsigned INT16
+#else /* !SHORT_PIKE_OPCODE */
+#define PIKE_OPCODE_T	unsigned INT8
+#endif /* SHORT_PIKE_OPCODE */
+#endif /* HAVE_COMPUTED_GOTO */
 
 #ifdef PIKE_DEBUG
 #define PROGRAM_LINE_ARGS int line, char *file