--- a/config.lib	Tue May 06 10:31:50 2008 +0000
+++ b/config.lib	Tue May 06 14:24:33 2008 +0000
@@ -882,7 +882,7 @@
 
 		# Each debug level reduces the optimalization by a bit
 		if [ $enable_debug -ge 1 ]; then
-			CFLAGS="$CFLAGS -g -D_DEBUG"
+			CFLAGS="$CFLAGS -g -D_DEBUG -D_FORTIFY_SOURCE=2"
 			if [ "$os" = "PSP" ]; then
 				CFLAGS="$CFLAGS -G0"
 			fi

--- a/projects/openttd_vs80.vcproj	Tue May 06 10:31:50 2008 +0000
+++ b/projects/openttd_vs80.vcproj	Tue May 06 14:24:33 2008 +0000
@@ -2392,10 +2392,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\track_dir.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\yapf\yapf.h"
 				>
 			</File>

--- a/projects/openttd_vs90.vcproj	Tue May 06 10:31:50 2008 +0000
+++ b/projects/openttd_vs90.vcproj	Tue May 06 14:24:33 2008 +0000
@@ -2389,10 +2389,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\track_dir.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\yapf\yapf.h"
 				>
 			</File>

--- a/source.list	Tue May 06 10:31:50 2008 +0000
+++ b/source.list	Tue May 06 14:24:33 2008 +0000
@@ -547,7 +547,6 @@
 # YAPF
 yapf/follow_track.hpp
 yapf/nodelist.hpp
-yapf/track_dir.hpp
 yapf/yapf.h
 yapf/yapf.hpp
 yapf/yapf_base.hpp

--- a/src/yapf/track_dir.hpp	Tue May 06 10:31:50 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* $Id$ */
-
-#ifndef  TRACK_DIR_HPP
-#define  TRACK_DIR_HPP
-
-#include "../openttd.h"
-
-#endif /* TRACK_DIR_HPP */

--- a/src/yapf/yapf.hpp	Tue May 06 10:31:50 2008 +0000
+++ b/src/yapf/yapf.hpp	Tue May 06 14:24:33 2008 +0000
@@ -3,10 +3,7 @@
 #ifndef  YAPF_HPP
 #define  YAPF_HPP
 
-
-
-#include "track_dir.hpp"
-
+#include "../openttd.h"
 #include "../vehicle_base.h"
 #include "../road_map.h"
 #include "../tunnel_map.h"