diff --git a/code/nel/src/georges/type.cpp b/code/nel/src/georges/type.cpp
index 344ba50f9..5b18c65c5 100644
--- a/code/nel/src/georges/type.cpp
+++ b/code/nel/src/georges/type.cpp
@@ -25,7 +25,6 @@
 #include "nel/georges/form.h"
 #include "nel/georges/form_elm.h"
 #include "nel/georges/form_loader.h"
-
 #include "nel/georges/type.h"
 
 using namespace NLMISC;
diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt
index 9d2e0dd82..2cf570f69 100644
--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../../include/nel/sound/*.h)
 
diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp
index da3c7d177..3a75433f4 100644
--- a/code/nel/src/sound/audio_mixer_user.cpp
+++ b/code/nel/src/sound/audio_mixer_user.cpp
@@ -35,7 +35,6 @@
 #include "nel/sound/driver/buffer.h"
 #include "nel/sound/driver/effect.h"
 
-#include "nel/sound/background_sound_manager.h"
 #include "nel/sound/background_sound_manager.h"
 #include "nel/sound/music_sound_manager.h"
 #include "nel/sound/background_source.h"
diff --git a/code/nel/src/sound/background_source.cpp b/code/nel/src/sound/background_source.cpp
index b6177999d..d8cb4a7a4 100644
--- a/code/nel/src/sound/background_source.cpp
+++ b/code/nel/src/sound/background_source.cpp
@@ -16,7 +16,6 @@
 
 #include "stdsound.h"
 #include "nel/sound/background_sound_manager.h"
-
 #include "nel/sound/background_source.h"
 
 using namespace std;
diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.h b/code/nel/src/sound/driver/dsound/buffer_dsound.h
index 0a1b100c5..fed09c413 100644
--- a/code/nel/src/sound/driver/dsound/buffer_dsound.h
+++ b/code/nel/src/sound/driver/dsound/buffer_dsound.h
@@ -17,7 +17,7 @@
 #ifndef NL_BUFFER_DSOUND_H
 #define NL_BUFFER_DSOUND_H
 
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND {
 
diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.h b/code/nel/src/sound/driver/dsound/listener_dsound.h
index 33e97a66b..fe8872cc2 100644
--- a/code/nel/src/sound/driver/dsound/listener_dsound.h
+++ b/code/nel/src/sound/driver/dsound/listener_dsound.h
@@ -17,7 +17,7 @@
 #ifndef NL_LISTENER_DSOUND_H
 #define NL_LISTENER_DSOUND_H
 
-#include <nel/sound/driver/listener.h>
+#include "nel/sound/driver/listener.h"
 
 namespace NLSOUND {
 
diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h b/code/nel/src/sound/driver/dsound/sound_driver_dsound.h
index b094776f0..14872c1e1 100644
--- a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h
+++ b/code/nel/src/sound/driver/dsound/sound_driver_dsound.h
@@ -17,7 +17,7 @@
 #ifndef NL_SOUND_DRIVER_DSOUND_H
 #define NL_SOUND_DRIVER_DSOUND_H
 
-#include <nel/sound/driver/sound_driver.h>
+#include "nel/sound/driver/sound_driver.h"
 
 #include "source_dsound.h"
 #include "buffer_dsound.h"
diff --git a/code/nel/src/sound/driver/dsound/source_dsound.cpp b/code/nel/src/sound/driver/dsound/source_dsound.cpp
index 2ef01f8c4..c3bff3289 100644
--- a/code/nel/src/sound/driver/dsound/source_dsound.cpp
+++ b/code/nel/src/sound/driver/dsound/source_dsound.cpp
@@ -616,7 +616,6 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi)
 	ptr = lbi.Ptr2;
 	count = lbi.Size2/2;
 
-
 	while (fade && count)
 	{
 		alpha = (fade<<16) / _XFadeSize;
diff --git a/code/nel/src/sound/driver/dsound/source_dsound.h b/code/nel/src/sound/driver/dsound/source_dsound.h
index 86130c800..81174c1a0 100644
--- a/code/nel/src/sound/driver/dsound/source_dsound.h
+++ b/code/nel/src/sound/driver/dsound/source_dsound.h
@@ -17,9 +17,9 @@
 #ifndef NL_SOURCE_DSOUND_H
 #define NL_SOURCE_DSOUND_H
 
-#include <nel/sound/driver/source.h>
-#include <nel/sound/driver/sound_driver.h>
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND {
 
diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.h b/code/nel/src/sound/driver/fmod/buffer_fmod.h
index 1678fb426..64d8cf592 100644
--- a/code/nel/src/sound/driver/fmod/buffer_fmod.h
+++ b/code/nel/src/sound/driver/fmod/buffer_fmod.h
@@ -18,7 +18,7 @@
 #define NL_BUFFER_FMOD_H
 
 
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/buffer.h"
 
 
 namespace NLSOUND {
diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.h b/code/nel/src/sound/driver/fmod/music_channel_fmod.h
index abaa9c510..28ffef6ce 100644
--- a/code/nel/src/sound/driver/fmod/music_channel_fmod.h
+++ b/code/nel/src/sound/driver/fmod/music_channel_fmod.h
@@ -17,7 +17,7 @@
 #ifndef NL_MUSIC_CHANNEL_FMOD_H
 #define NL_MUSIC_CHANNEL_FMOD_H
 
-#include <nel/sound/driver/music_channel.h>
+#include "nel/sound/driver/music_channel.h"
 
 struct FSOUND_STREAM;
 
diff --git a/code/nel/src/sound/driver/fmod/sound_driver_fmod.h b/code/nel/src/sound/driver/fmod/sound_driver_fmod.h
index bcf75ece6..8beabe562 100644
--- a/code/nel/src/sound/driver/fmod/sound_driver_fmod.h
+++ b/code/nel/src/sound/driver/fmod/sound_driver_fmod.h
@@ -17,7 +17,7 @@
 #ifndef NL_SOUND_DRIVER_FMOD_H
 #define NL_SOUND_DRIVER_FMOD_H
 
-#include <nel/sound/driver/sound_driver.h>
+#include "nel/sound/driver/sound_driver.h"
 
 namespace NLSOUND {
 	class IListener;
diff --git a/code/nel/src/sound/driver/fmod/source_fmod.h b/code/nel/src/sound/driver/fmod/source_fmod.h
index 34e3168d0..a8ef4fb57 100644
--- a/code/nel/src/sound/driver/fmod/source_fmod.h
+++ b/code/nel/src/sound/driver/fmod/source_fmod.h
@@ -17,9 +17,9 @@
 #ifndef NL_SOURCE_FMOD_H
 #define NL_SOURCE_FMOD_H
 
-#include <nel/sound/driver/source.h>
-#include <nel/sound/driver/sound_driver.h>
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND {
 	class CBufferFMod;
diff --git a/code/nel/src/sound/driver/fmod/stdfmod.h b/code/nel/src/sound/driver/fmod/stdfmod.h
index 9afe2bef1..afb1af3f1 100644
--- a/code/nel/src/sound/driver/fmod/stdfmod.h
+++ b/code/nel/src/sound/driver/fmod/stdfmod.h
@@ -24,22 +24,22 @@
 #include <cmath>
 #include <limits>
 
-#include <nel/misc/common.h>
-#include <nel/misc/time_nl.h>
-#include <nel/misc/singleton.h>
-#include <nel/misc/fast_mem.h>
-#include <nel/misc/debug.h>
-#include <nel/misc/vector.h>
-#include <nel/misc/path.h>
-#include <nel/misc/file.h>
-#include <nel/misc/matrix.h>
-#include <nel/misc/big_file.h>
-#include <nel/misc/hierarchical_timer.h>
-#include <nel/misc/dynloadlib.h>
+#include "nel/misc/common.h"
+#include "nel/misc/time_nl.h"
+#include "nel/misc/singleton.h"
+#include "nel/misc/fast_mem.h"
+#include "nel/misc/debug.h"
+#include "nel/misc/vector.h"
+#include "nel/misc/path.h"
+#include "nel/misc/file.h"
+#include "nel/misc/matrix.h"
+#include "nel/misc/big_file.h"
+#include "nel/misc/hierarchical_timer.h"
+#include "nel/misc/dynloadlib.h"
 
-#include <nel/sound/driver/sound_driver.h>
-#include <nel/sound/driver/buffer.h>
-#include <nel/sound/driver/source.h>
-#include <nel/sound/driver/listener.h>
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/listener.h"
 
 /* end of file */
diff --git a/code/nel/src/sound/driver/openal/buffer_al.cpp b/code/nel/src/sound/driver/openal/buffer_al.cpp
index 7714abc67..63a0a19d9 100644
--- a/code/nel/src/sound/driver/openal/buffer_al.cpp
+++ b/code/nel/src/sound/driver/openal/buffer_al.cpp
@@ -117,7 +117,7 @@ bool CBufferAL::unlock(uint size)
 		_DataPtr = NULL;
 		_Capacity = 0;
 	}
-	
+
 	// Error handling
 	if (alGetError() == AL_NO_ERROR)
 		_IsLoaded = true;
@@ -159,7 +159,7 @@ bool CBufferAL::fill(const uint8 *src, uint size)
 	
 	// Fill buffer (OpenAL one)
 	alBufferData(_BufferName, _SampleFormat, src, size, _Frequency);
-	
+
 	// Error handling
 	if (alGetError() == AL_NO_ERROR)
 		_IsLoaded = true;
diff --git a/code/nel/src/sound/driver/openal/buffer_al.h b/code/nel/src/sound/driver/openal/buffer_al.h
index 4564f5be3..b2abf2036 100644
--- a/code/nel/src/sound/driver/openal/buffer_al.h
+++ b/code/nel/src/sound/driver/openal/buffer_al.h
@@ -17,7 +17,7 @@
 #ifndef NL_BUFFER_AL_H
 #define NL_BUFFER_AL_H
 
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND
 {
diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.h b/code/nel/src/sound/driver/openal/sound_driver_al.h
index 49150f31e..a58d5418e 100644
--- a/code/nel/src/sound/driver/openal/sound_driver_al.h
+++ b/code/nel/src/sound/driver/openal/sound_driver_al.h
@@ -17,7 +17,7 @@
 #ifndef NL_SOUND_DRIVER_AL_H
 #define NL_SOUND_DRIVER_AL_H
 
-#include <nel/sound/driver/sound_driver.h>
+#include "nel/sound/driver/sound_driver.h"
 
 namespace NLSOUND {
 	class CBufferAL;
@@ -126,7 +126,7 @@ public:
 	
 	virtual void startBench();
 	virtual void endBench();
-	virtual void displayBench(NLMISC::CLog * /* log */);
+	virtual void displayBench(NLMISC::CLog *log);
 
 
 	/// Change the rolloff factor and apply to all sources
@@ -136,7 +136,7 @@ public:
 	virtual void commit3DChanges();
 
 	/// Write information about the driver to the output stream.
-	virtual void writeProfile(std::string& /* out */);
+	virtual void writeProfile(std::string& out);
 
 	/// Remove a buffer
 	void removeBuffer(CBufferAL *buffer);
diff --git a/code/nel/src/sound/driver/openal/source_al.cpp b/code/nel/src/sound/driver/openal/source_al.cpp
index 4d5bcfa47..154bcebe1 100644
--- a/code/nel/src/sound/driver/openal/source_al.cpp
+++ b/code/nel/src/sound/driver/openal/source_al.cpp
@@ -375,7 +375,7 @@ bool CSourceAL::isPaused() const
 uint32 CSourceAL::getTime()
 {
 	if (!_StartTime) return 0;
- 	 return (uint32)(CTime::getLocalTime() - _StartTime);
+	return (uint32)(CTime::getLocalTime() - _StartTime);
 }
 
 /// Set the position vector.
diff --git a/code/nel/src/sound/driver/openal/source_al.h b/code/nel/src/sound/driver/openal/source_al.h
index d3c08bf41..22cb3d67d 100644
--- a/code/nel/src/sound/driver/openal/source_al.h
+++ b/code/nel/src/sound/driver/openal/source_al.h
@@ -17,7 +17,7 @@
 #ifndef NL_SOURCE_AL_H
 #define NL_SOURCE_AL_H
 
-#include <nel/sound/driver/source.h>
+#include "nel/sound/driver/source.h"
 
 namespace NLSOUND {
 	class IBuffer;
diff --git a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
index 19a1b0486..6655c57a8 100644
--- a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
+++ b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
@@ -17,7 +17,7 @@
 #ifndef NLSOUND_ADPCM_XAUDIO2_H
 #define NLSOUND_ADPCM_XAUDIO2_H
 
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND {
 	class CBufferXAudio2;
diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
index 54f802978..0094494ed 100644
--- a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
+++ b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
@@ -17,7 +17,7 @@
 #ifndef NLSOUND_BUFFER_XAUDIO2_H
 #define NLSOUND_BUFFER_XAUDIO2_H
 
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND {
 	class CSoundDriverXAudio2;
diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
index 146611de9..10a39ffe5 100644
--- a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
+++ b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
@@ -17,8 +17,8 @@
 #ifndef NLSOUND_LISTENER_XAUDIO2_H
 #define NLSOUND_LISTENER_XAUDIO2_H
 
-#include <nel/sound/driver/listener.h>
-#include <nel/sound/driver/sound_driver.h>
+#include "nel/sound/driver/listener.h"
+#include "nel/sound/driver/sound_driver.h"
 
 namespace NLSOUND {
 	class CSoundDriverXAudio2;
diff --git a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h b/code/nel/src/sound/driver/xaudio2/source_xaudio2.h
index f5050c12f..a2d542349 100644
--- a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h
+++ b/code/nel/src/sound/driver/xaudio2/source_xaudio2.h
@@ -17,9 +17,9 @@
 #ifndef NLSOUND_SOURCE_XAUDIO2_H
 #define NLSOUND_SOURCE_XAUDIO2_H
 
-#include <nel/sound/driver/source.h>
-#include <nel/sound/driver/sound_driver.h>
-#include <nel/sound/driver/buffer.h>
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 namespace NLSOUND {
 	class CSoundDriverXAudio2;
diff --git a/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp b/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
index 1b2959f1e..cb317102c 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
@@ -1620,7 +1620,6 @@ public:
 		}
 	}
 };
-
 REGISTER_ACTION_HANDLER(CHandlerPhraseSelectShortcutBar, "select_shortcut_bar");
 
 
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index 397414deb..0e7d31c79 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -963,7 +963,6 @@ void impulseFarTell(NLMISC::CBitMemStream &impulse)
 	ChatMngr.processFarTellString(impulse, InterfaceChatDisplayer);
 }
 
-
 void impulseTell2(NLMISC::CBitMemStream &impulse)
 {
 	ChatMngr.processTellString2(impulse, InterfaceChatDisplayer);
diff --git a/code/ryzom/server/src/server_share/char_name_mapper_itf.h b/code/ryzom/server/src/server_share/char_name_mapper_itf.h
index b9d51c02f..e4abc7332 100644
--- a/code/ryzom/server/src/server_share/char_name_mapper_itf.h
+++ b/code/ryzom/server/src/server_share/char_name_mapper_itf.h
@@ -21,9 +21,7 @@
 #ifndef CHAR_NAME_MAPPER_ITF
 #define CHAR_NAME_MAPPER_ITF
 #include "nel/misc/types_nl.h"
-#ifdef NL_COMP_VC8
-  #include <memory>
-#endif
+#include <memory>
 #include "nel/misc/hierarchical_timer.h"
 #include "nel/misc/string_conversion.h"
 #include "nel/net/message.h"
diff --git a/code/ryzom/server/src/server_share/chat_unifier_itf.h b/code/ryzom/server/src/server_share/chat_unifier_itf.h
index 2f5a62816..37f7b45b2 100644
--- a/code/ryzom/server/src/server_share/chat_unifier_itf.h
+++ b/code/ryzom/server/src/server_share/chat_unifier_itf.h
@@ -21,9 +21,7 @@
 #ifndef CHAT_UNIFIER_ITF
 #define CHAT_UNIFIER_ITF
 #include "nel/misc/types_nl.h"
-#ifdef NL_COMP_VC8
-  #include <memory>
-#endif
+#include <memory>
 #include "nel/misc/hierarchical_timer.h"
 #include "nel/misc/string_conversion.h"
 #include "nel/net/message.h"
diff --git a/code/ryzom/server/src/server_share/command_executor_itf.h b/code/ryzom/server/src/server_share/command_executor_itf.h
index baa9a45ed..3c2feb606 100644
--- a/code/ryzom/server/src/server_share/command_executor_itf.h
+++ b/code/ryzom/server/src/server_share/command_executor_itf.h
@@ -21,9 +21,7 @@
 #ifndef COMMAND_EXECUTOR_ITF
 #define COMMAND_EXECUTOR_ITF
 #include "nel/misc/types_nl.h"
-#ifdef NL_COMP_VC8
-  #include <memory>
-#endif
+#include <memory>
 #include "nel/misc/hierarchical_timer.h"
 #include "nel/misc/string_conversion.h"
 #include "nel/net/message.h"
diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.h b/code/ryzom/server/src/server_share/entity_locator_itf.h
index c4d1ac8c9..a33e94e44 100644
--- a/code/ryzom/server/src/server_share/entity_locator_itf.h
+++ b/code/ryzom/server/src/server_share/entity_locator_itf.h
@@ -21,9 +21,7 @@
 #ifndef ENTITY_LOCATOR_ITF
 #define ENTITY_LOCATOR_ITF
 #include "nel/misc/types_nl.h"
-#ifdef NL_COMP_VC8
-  #include <memory>
-#endif
+#include <memory>
 #include "nel/misc/hierarchical_timer.h"
 #include "nel/misc/string_conversion.h"
 #include "nel/net/message.h"
diff --git a/code/ryzom/server/src/server_share/logger_service_itf.h b/code/ryzom/server/src/server_share/logger_service_itf.h
index 01723f118..c6bda3f5c 100644
--- a/code/ryzom/server/src/server_share/logger_service_itf.h
+++ b/code/ryzom/server/src/server_share/logger_service_itf.h
@@ -21,9 +21,7 @@
 #ifndef LOGGER_SERVICE_ITF
 #define LOGGER_SERVICE_ITF
 #include "nel/misc/types_nl.h"
-#ifdef NL_COMP_VC8
-  #include <memory>
-#endif
+#include <memory>
 #include "nel/misc/hierarchical_timer.h"
 #include "nel/misc/string_conversion.h"
 #include "nel/net/message.h"
diff --git a/code/ryzom/tools/leveldesign/export/export.cpp b/code/ryzom/tools/leveldesign/export/export.cpp
index 0380aad4d..c451ac094 100644
--- a/code/ryzom/tools/leveldesign/export/export.cpp
+++ b/code/ryzom/tools/leveldesign/export/export.cpp
@@ -1793,7 +1793,6 @@ bool CExport::generateIGFromFlora (const std::string &SrcFile, std::vector<SExpo
 			vi.Pos = pos;
 			if (pos.z > -90000.0f)
 				_FloraInsts.push_back (vi);
-
 		} // End of Generate for a point
 
 		// Generate for a path
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
index 0e24b05e6..13e2d0a5b 100644
--- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
+++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
@@ -282,7 +282,7 @@ public:
 	
 	string genCode(CMissionData &md)
 	{
-		string ret = "";
+		string ret;
 		if (!_MissionName.empty())
 		{
 			ret =  "spawn_mission : " + _MissionName + " : " + _GiverName;