diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 01559d993..c13c95d7c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,7 +9,7 @@ main/bmread.c, main/hostage.c, main/piggy.h: Moved remove_char declaration to pi
 main/multi.h, main/net_udp.c: Moved multi_* declarations to multi.h - patch by Kp
 maths/rand.c: Included maths.h in rand.c to get d_rand prototype - patch by Kp
 arch/include/joy.h, arch/sdl/event.c, arch/sdl/joy.c: Moved joy_*_handler declarations to joy.h - patch by Kp
-
+editor/group.c, editor/medwall.c, editor/segment.c, main/gameseg.h, main/wall.h: Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp
 
 20121102
 --------
diff --git a/editor/group.c b/editor/group.c
index 79d85dce4..f9bf8ad08 100644
--- a/editor/group.c
+++ b/editor/group.c
@@ -80,8 +80,6 @@ int		Group_orientation[MAX_GROUPS+1];
 int		current_group=-1;
 int		num_groups=0;
 
-extern void validate_segment_side(segment *sp, int sidenum);
-
 // -- void swap_negate_columns(vms_matrix *rotmat, int col1, int col2)
 // -- {
 // -- 	fix	col1_1,col1_2,col1_3;
diff --git a/editor/medwall.c b/editor/medwall.c
index e93779ce0..83e83ee8f 100644
--- a/editor/medwall.c
+++ b/editor/medwall.c
@@ -610,7 +610,6 @@ int wall_dialog_handler(UI_DIALOG *dlg, d_event *event, wall_dialog *wd)
 
 
 //---------------------------------------------------------------------
-extern void wall_close_door_num(int door_num);
 
 // Restore all walls to original status (closed doors, repaired walls)
 int wall_restore_all()
diff --git a/editor/segment.c b/editor/segment.c
index e214b898d..115cb1bc0 100644
--- a/editor/segment.c
+++ b/editor/segment.c
@@ -1080,8 +1080,6 @@ void delete_vertices_in_segment(segment *sp)
 	update_num_vertices();
 }
 
-extern void validate_segment_side(segment *sp, int sidenum);
-
 // -------------------------------------------------------------------------------
 //	Delete segment *sp in Segments array.
 // Return value:
diff --git a/main/gameseg.h b/main/gameseg.h
index 38126df45..1d42a766b 100644
--- a/main/gameseg.h
+++ b/main/gameseg.h
@@ -226,6 +226,7 @@ extern	void extract_up_vector_from_segment(segment *sp,vms_vector *vp);
 extern void create_walls_on_side(segment *sp, int sidenum);
 
 extern void pick_random_point_in_seg(vms_vector *new_pos, int segnum);
+extern void validate_segment_side(segment *sp, int sidenum);
 
 #endif
  
diff --git a/main/wall.h b/main/wall.h
index 569d31e67..81f945917 100644
--- a/main/wall.h
+++ b/main/wall.h
@@ -274,6 +274,7 @@ extern void active_door_read_n_swap(active_door *ad, int n, int swap, PHYSFS_fil
 void wall_read_n_swap(wall *w, int n, int swap, PHYSFS_file *fp);
 
 extern void wall_write(wall *w, short version, PHYSFS_file *fp);
+void wall_close_door_num(int door_num);
 
 #endif