diff --git a/SConstruct b/SConstruct
index e93295fd62..2f35a055c4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -101,14 +101,14 @@ if env['CXX'].startswith('g++'):
    #env.Append(CCFLAGS = ['-Wconversion'])
    env.Append(CCFLAGS = ['-Wcast-align'])
    env.Append(CCFLAGS = ['-Wshadow'])
-   env.Append(CCFLAGS = ['-Werror=unused-parameter'])
+   env.Append(CCFLAGS = ['-Wunused-parameter'])
 elif env['CXX'].startswith('clang++'):
    #env.Append(CCFLAGS = ['-Wcast-align'])
    #env.Append(CCFLAGS = ['-Wglobal-constructors'])
    #env.Append(CCFLAGS = ['-Wconversion'])
    env.Append(CCFLAGS = ['-Wno-padded'])
    env.Append(CCFLAGS = ['-Wshadow'])
-   env.Append(CCFLAGS = ['-Werror=unused-parameter'])
+   env.Append(CCFLAGS = ['-Wunused-parameter'])
 
    # Wpadded
    # Wsign-conversion
diff --git a/changelog.md b/changelog.md
index 0ec12ba10b..87c3f5dafb 100644
--- a/changelog.md
+++ b/changelog.md
@@ -19,6 +19,11 @@ HEAD
   iostream transport.
 - Compatibility: Adjust usage of std::min to be more compatible with systems
   that define a min(...) macro.
+- Compatibility: Removes unused parameters from all library, test, and example
+  code. This assists with those developing with -Werror and -Wunused-parameter
+  #376
+- Cleanup: Removes unused functions, fixes variable shadow warnings, normalizes
+  all whitespace in library, examples, and tests to 4 spaces. #376
 
 0.3.0 - 2014-08-10
 - Feature: Adds `start_perpetual` and `stop_perpetual` methods to asio transport