diff --git a/include/rapidjson/fwd.h b/include/rapidjson/fwd.h
index 9c0466c3..eab45c7b 100644
--- a/include/rapidjson/fwd.h
+++ b/include/rapidjson/fwd.h
@@ -17,6 +17,11 @@
 
 #include "rapidjson.h"
 
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 // encodings.h
@@ -143,4 +148,8 @@ typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, voi
 
 RAPIDJSON_NAMESPACE_END
 
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_RAPIDJSONFWD_H_
diff --git a/test/unittest/fwdtest.cpp b/test/unittest/fwdtest.cpp
index 3cf8f631..279868df 100644
--- a/test/unittest/fwdtest.cpp
+++ b/test/unittest/fwdtest.cpp
@@ -47,11 +47,11 @@ struct Foo {
     // stringbuffer.h
     StringBuffer* stringbuffer;
 
-    // filereadstream.h
-    FileReadStream* filereadstream;
+    // // filereadstream.h
+    // FileReadStream* filereadstream;
 
-    // filewritestream.h
-    FileWriteStream* filewritestream;
+    // // filewritestream.h
+    // FileWriteStream* filewritestream;
 
     // memorybuffer.h
     MemoryBuffer* memorybuffer;
@@ -77,7 +77,7 @@ struct Foo {
     SchemaDocument* schemadocument;
     SchemaValidator* schemavalidator;
 
-    char buffer[16];
+    // char buffer[16];
 };
 
 // Using type definitions here.
@@ -115,11 +115,11 @@ Foo::Foo() :
     // stringbuffer.h
     stringbuffer(RAPIDJSON_NEW(StringBuffer)),
 
-    // filereadstream.h
-    filereadstream(RAPIDJSON_NEW(FileReadStream(stdout, buffer, sizeof(buffer)))),
+    // // filereadstream.h
+    // filereadstream(RAPIDJSON_NEW(FileReadStream(stdout, buffer, sizeof(buffer)))),
 
-    // filewritestream.h
-    filewritestream(RAPIDJSON_NEW(FileWriteStream(stdout, buffer, sizeof(buffer)))),
+    // // filewritestream.h
+    // filewritestream(RAPIDJSON_NEW(FileWriteStream(stdout, buffer, sizeof(buffer)))),
 
     // memorybuffer.h
     memorybuffer(RAPIDJSON_NEW(MemoryBuffer)),
@@ -172,11 +172,11 @@ Foo::~Foo() {
     // stringbuffer.h
     RAPIDJSON_DELETE(stringbuffer);
 
-    // filereadstream.h
-    RAPIDJSON_DELETE(filereadstream);
+    // // filereadstream.h
+    // RAPIDJSON_DELETE(filereadstream);
 
-    // filewritestream.h
-    RAPIDJSON_DELETE(filewritestream);
+    // // filewritestream.h
+    // RAPIDJSON_DELETE(filewritestream);
 
     // memorybuffer.h
     RAPIDJSON_DELETE(memorybuffer);