Index: branches/new_class_id/src/lib/network/network_game_manager.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_game_manager.cc	(revision 9836)
+++ branches/new_class_id/src/lib/network/network_game_manager.cc	(revision 9856)
@@ -42,5 +42,5 @@
 #include "multiplayer_team_deathmatch.h"
 
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 
 
Index: branches/new_class_id/src/lib/network/network_log.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_log.cc	(revision 9836)
+++ branches/new_class_id/src/lib/network/network_log.cc	(revision 9856)
@@ -15,4 +15,5 @@
 
 #include "network_log.h"
+#include <cassert>
 
 /**
@@ -53,11 +54,11 @@
     return false;
   }
-  
+
   listensock = SDLNet_TCP_Open( &ip );
-  
+
   if( !listensock ) {
     PRINT(1)( "SDLNet_TCP_Open: %s\n", SDLNet_GetError() );
     return false;
-  } 
+  }
 
   return true;
@@ -71,9 +72,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
- 
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   printfnet();
 }
@@ -85,5 +86,5 @@
 {
   TCPsocket newSock = SDLNet_TCP_Accept( listensock );
-  
+
   if ( newSock )
     sockets.push_back( newSock );
@@ -97,9 +98,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(0)( buf );
   printfnet();
@@ -114,9 +115,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(1)( buf );
   printfnet();
@@ -131,9 +132,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(2)( buf );
   printfnet();
@@ -148,9 +149,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(3)( buf );
   printfnet();
@@ -165,9 +166,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(4)( buf );
   printfnet();
@@ -182,9 +183,9 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(5)( buf );
   printfnet();
@@ -200,5 +201,5 @@
   if ( !listensock )
     return;
-  
+
   acceptNewConnections();
 
@@ -213,5 +214,5 @@
       continue;
     }
-    
+
     it++;
   }
Index: branches/new_class_id/src/lib/network/network_manager.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_manager.cc	(revision 9836)
+++ branches/new_class_id/src/lib/network/network_manager.cc	(revision 9856)
@@ -27,5 +27,5 @@
 #include "shared_network_data.h"
 #include "network_stream.h"
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 #include "network_log.h"
 #include "network_game_manager.h"
Index: branches/new_class_id/src/lib/network/network_stream.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_stream.cc	(revision 9836)
+++ branches/new_class_id/src/lib/network/network_stream.cc	(revision 9856)
@@ -33,5 +33,5 @@
 #include "shared_network_data.h"
 #include "message_manager.h"
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 #include "zip.h"
 
Index: branches/new_class_id/src/lib/network/player_stats.cc
===================================================================
--- branches/new_class_id/src/lib/network/player_stats.cc	(revision 9836)
+++ branches/new_class_id/src/lib/network/player_stats.cc	(revision 9856)
@@ -25,5 +25,5 @@
 #include "converter.h"
 
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 
 #include "debug.h"
Index: branches/new_class_id/src/lib/network/proxy/proxy_control.cc
===================================================================
--- branches/new_class_id/src/lib/network/proxy/proxy_control.cc	(revision 9836)
+++ branches/new_class_id/src/lib/network/proxy/proxy_control.cc	(revision 9856)
@@ -27,5 +27,5 @@
 #include "converter.h"
 
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 
 #include "debug.h"
