Partly revert 2008-11-09T04:35:13Z!esr@thyrsus.com.

The deheader tool didn't recognize #if so processed them. The revert has been
done manually to keep the unneeded headers out.

src/attack_prediction.cpp

@@ -30,6 +30,10 @@
 // -DCHECK for testing correctness
 // (run tools/wesnoth-attack-sim.c --check on output)
 #if defined(BENCHMARK) || defined(CHECK)
+#include <time.h> 	 
+#include <sys/time.h> 	 
+#include <stdio.h> 	 
+#include <stdlib.h> 	 
 #endif
 
 #ifdef ATTACK_PREDICTION_DEBUG

src/clipboard.cpp

@@ -369,7 +369,7 @@ std::string copy_from_clipboard(const bool mouse)
 
 #endif
 #ifdef _WIN32
-
+#include <windows.h>
 #define CLIPBOARD_FUNCS_DEFINED
 
 void handle_system_event(const SDL_Event& )
@@ -440,7 +440,7 @@ std::string copy_from_clipboard(const bool)
 #endif
 
 #ifdef __BEOS__
-
+#include <Clipboard.h>
 #define CLIPBOARD_FUNCS_DEFINED
 
 void copy_to_clipboard(const std::string& text, const bool)
@@ -478,6 +478,7 @@ std::string copy_from_clipboard(const bool)
 #ifdef __APPLE__
 #define CLIPBOARD_FUNCS_DEFINED
 
+#include <Carbon/Carbon.h>
 
 void copy_to_clipboard(const std::string& text, const bool)
 {

src/network.cpp

@@ -37,8 +37,12 @@
 #undef INADDR_ANY
 #undef INADDR_BROADCAST
 #undef INADDR_NONE
+#include <windows.h>
 #else
+#include <sys/types.h> 	 
+#include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>  // for TCP_NODELAY
 #ifdef __BEOS__
 #include <socket.h>
 #else

src/tests/test_policy.cpp

@@ -21,6 +21,7 @@
 #define TEST_POLICY_DEBUG 0
 
 #if TEST_POLICY_DEBUG
+#include <iostream>
 #endif
 
 BOOST_AUTO_TEST_SUITE( policy )