diff --git a/edef.h b/edef.h
index a8d2160..7a024b7 100644
--- a/edef.h
+++ b/edef.h
@@ -98,8 +98,14 @@ extern int scrollcount;		/* number of lines to scroll */
 
 extern int currow;		/* Cursor row                   */
 extern int curcol;		/* Cursor column                */
+
+
+#define CFCPCN  0x0001		/* Last command was C-P, C-N    */
+#define CFKILL  0x0002		/* Last command was a kill      */
+
 extern int thisflag;		/* Flags, this command          */
 extern int lastflag;		/* Flags, last command          */
+
 extern int curgoal;		/* Goal for C-P, C-N            */
 extern struct window *curwp;		/* Current window               */
 extern struct buffer *curbp;		/* Current buffer               */
diff --git a/estruct.h b/estruct.h
index 023e149..54f9a2a 100644
--- a/estruct.h
+++ b/estruct.h
@@ -249,18 +249,6 @@
 
 #include "retcode.h"
 
-/*
- * PTBEG, PTEND, FORWARD, and REVERSE are all toggle-able values for
- * the scan routines.
- */
-#define	PTBEG	0		/* Leave the point at the beginning on search   */
-#define	PTEND	1		/* Leave the point at the end on search         */
-#define	FORWARD	0		/* forward direction            */
-#define REVERSE	1		/* backwards direction          */
-
-#define CFCPCN  0x0001		/* Last command was C-P, C-N    */
-#define CFKILL  0x0002		/* Last command was a kill      */
-
 #define	BELL	0x07		/* a bell character             */
 #define	TAB	0x09		/* a tab character              */
 
diff --git a/search.h b/search.h
index fb6afee..6f16445 100644
--- a/search.h
+++ b/search.h
@@ -5,11 +5,21 @@
 
 #include "line.h"
 
+/*
+ * PTBEG, PTEND, FORWARD, and REVERSE are all toggle-able values for
+ * the scan routines.
+ */
+#define	PTBEG	0		/* Leave the point at the beginning on search   */
+#define	PTEND	1		/* Leave the point at the end on search         */
+#define	FORWARD	0		/* forward direction            */
+#define REVERSE	1		/* backwards direction          */
+
+int scanner( const char *patrn, int direct, int beg_or_end) ;
+
 int forwsearch( int f, int n) ;
 int forwhunt( int f, int n) ;
 int backsearch( int f, int n) ;
 int backhunt( int f, int n) ;
-int scanner( const char *patrn, int direct, int beg_or_end) ;
 int eq( unsigned char bc, unsigned char pc) ;
 void savematch( void) ;
 void rvstrcpy( char *rvstr, char *str) ;