diff --git a/include/freetype/config/ftstdlib.h b/include/freetype/config/ftstdlib.h
index 11d5d0e..c5dfca5 100644
--- a/include/freetype/config/ftstdlib.h
+++ b/include/freetype/config/ftstdlib.h
@@ -32,6 +32,17 @@
 #ifndef __FTSTDLIB_H__
 #define __FTSTDLIB_H__
 
+#if defined( _MSC_VER ) && _MSC_VER == 1500  /* Visual C++ 2008 bug */
+
+#pragma warning( push )
+#ifdef __STDC__
+  /* To work around a bug with distributed headers, we temporarily disable */
+  /* the warning `nonstandard extension 'single line comment' was used'    */
+  /* here in order to compile cleanly with the maximum level of warnings.  */
+#pragma warning( disable : 4001 )
+#endif
+
+#endif	/* Visual C++ 2008 headers bug #356380 workaround */
 
 #include <stddef.h>
 
@@ -168,6 +179,10 @@
 #include <stdarg.h>
 
 
+#if defined( _MSC_VER ) && _MSC_VER == 1500  /* Visual C++ 2008 bug */
+#pragma warning( pop )
+#endif
+
 #endif /* __FTSTDLIB_H__ */