diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c
--- a/contrib/ee/ee.c
+++ b/contrib/ee/ee.c
@@ -219,12 +219,6 @@
 WINDOW *help_win;
 WINDOW *info_win;
 
-#if defined(__STDC__) || defined(__cplusplus)
-#define P_(s) s
-#else
-#define P_(s) ()
-#endif
-
 
 /*
  |	The following structure allows menu items to be flexibly declared.
@@ -247,98 +241,98 @@
 
 struct menu_entries {
 	char *item_string;
-	int (*procedure)P_((struct menu_entries *));
+	int (*procedure)(struct menu_entries *);
 	struct menu_entries *ptr_argument;
-	int (*iprocedure)P_((int));
-	void (*nprocedure)P_((void));
+	int (*iprocedure)(int);
+	void (*nprocedure)(void);
 	int argument;
 	};
 
-int main P_((int argc, char *argv[]));
-unsigned char *resiz_line P_((int factor, struct text *rline, int rpos));
-void insert P_((int character));
-void delete P_((int disp));
-void scanline P_((unsigned char *pos));
-int tabshift P_((int temp_int));
-int out_char P_((WINDOW *window, int character, int column));
-int len_char P_((int character, int column));
-void draw_line P_((int vertical, int horiz, unsigned char *ptr, int t_pos, int length));
-void insert_line P_((int disp));
-struct text *txtalloc P_((void));
-struct files *name_alloc P_((void));
-unsigned char *next_word P_((unsigned char *string));
-void prev_word P_((void));
-void control P_((void));
-void emacs_control P_((void));
-void bottom P_((void));
-void top P_((void));
-void nextline P_((void));
-void prevline P_((void));
-void left P_((int disp));
-void right P_((int disp));
-void find_pos P_((void));
-void up P_((void));
-void down P_((void));
-void function_key P_((void));
-void print_buffer P_((void));
-void command_prompt P_((void));
-void command P_((char *cmd_str1));
-int scan P_((char *line, int offset, int column));
-char *get_string P_((char *prompt, int advance));
-int compare P_((char *string1, char *string2, int sensitive));
-void goto_line P_((char *cmd_str));
-void midscreen P_((int line, unsigned char *pnt));
-void get_options P_((int numargs, char *arguments[]));
-void check_fp P_((void));
-void get_file P_((char *file_name));
-void get_line P_((int length, unsigned char *in_string, int *append));
-void draw_screen P_((void));
-void finish P_((void));
-int quit P_((int noverify));
-void edit_abort P_((int arg));
-void delete_text P_((void));
-int write_file P_((char *file_name, int warn_if_exists));
-int search P_((int display_message));
-void search_prompt P_((void));
-void del_char P_((void));
-void undel_char P_((void));
-void del_word P_((void));
-void undel_word P_((void));
-void del_line P_((void));
-void undel_line P_((void));
-void adv_word P_((void));
-void move_rel P_((int direction, int lines));
-void eol P_((void));
-void bol P_((void));
-void adv_line P_((void));
-void sh_command P_((char *string));
-void set_up_term P_((void));
-void resize_check P_((void));
-int menu_op P_((struct menu_entries *));
-void paint_menu P_((struct menu_entries menu_list[], int max_width, int max_height, int list_size, int top_offset, WINDOW *menu_win, int off_start, int vert_size));
-void help P_((void));
-void paint_info_win P_((void));
-void no_info_window P_((void));
-void create_info_window P_((void));
-int file_op P_((int arg));
-void shell_op P_((void));
-void leave_op P_((void));
-void redraw P_((void));
-int Blank_Line P_((struct text *test_line));
-void Format P_((void));
-void ee_init P_((void));
-void dump_ee_conf P_((void));
-void echo_string P_((char *string));
-void spell_op P_((void));
-void ispell_op P_((void));
-int first_word_len P_((struct text *test_line));
-void Auto_Format P_((void));
-void modes_op P_((void));
-char *is_in_string P_((char *string, char *substring));
-char *resolve_name P_((char *name));
-int restrict_mode P_((void));
-int unique_test P_((char *string, char *list[]));
-void strings_init P_((void));
+int main (int argc, char *argv[]);
+unsigned char *resiz_line (int factor, struct text *rline, int rpos);
+void insert (int character);
+void delete (int disp);
+void scanline (unsigned char *pos);
+int tabshift (int temp_int);
+int out_char (WINDOW *window, int character, int column);
+int len_char (int character, int column);
+void draw_line (int vertical, int horiz, unsigned char *ptr, int t_pos, int length);
+void insert_line (int disp);
+struct text *txtalloc (void);
+struct files *name_alloc (void);
+unsigned char *next_word (unsigned char *string);
+void prev_word (void);
+void control (void);
+void emacs_control (void);
+void bottom (void);
+void top (void);
+void nextline (void);
+void prevline (void);
+void left (int disp);
+void right (int disp);
+void find_pos (void);
+void up (void);
+void down (void);
+void function_key (void);
+void print_buffer (void);
+void command_prompt (void);
+void command (char *cmd_str1);
+int scan (char *line, int offset, int column);
+char *get_string (char *prompt, int advance);
+int compare (char *string1, char *string2, int sensitive);
+void goto_line (char *cmd_str);
+void midscreen (int line, unsigned char *pnt);
+void get_options (int numargs, char *arguments[]);
+void check_fp (void);
+void get_file (char *file_name);
+void get_line (int length, unsigned char *in_string, int *append);
+void draw_screen (void);
+void finish (void);
+int quit (int noverify);
+void edit_abort (int arg);
+void delete_text (void);
+int write_file (char *file_name, int warn_if_exists);
+int search (int display_message);
+void search_prompt (void);
+void del_char (void);
+void undel_char (void);
+void del_word (void);
+void undel_word (void);
+void del_line (void);
+void undel_line (void);
+void adv_word (void);
+void move_rel (int direction, int lines);
+void eol (void);
+void bol (void);
+void adv_line (void);
+void sh_command (char *string);
+void set_up_term (void);
+void resize_check (void);
+int menu_op (struct menu_entries *);
+void paint_menu (struct menu_entries menu_list[], int max_width, int max_height, int list_size, int top_offset, WINDOW *menu_win, int off_start, int vert_size);
+void help (void);
+void paint_info_win (void);
+void no_info_window (void);
+void create_info_window (void);
+int file_op (int arg);
+void shell_op (void);
+void leave_op (void);
+void redraw (void);
+int Blank_Line (struct text *test_line);
+void Format (void);
+void ee_init (void);
+void dump_ee_conf (void);
+void echo_string (char *string);
+void spell_op (void);
+void ispell_op (void);
+int first_word_len (struct text *test_line);
+void Auto_Format (void);
+void modes_op (void);
+char *is_in_string (char *string, char *substring);
+char *resolve_name (char *name);
+int restrict_mode (void);
+int unique_test (char *string, char *list[]);
+void strings_init (void);
 
 #undef P_
 /*