diff --git a/include/GL/glew.h b/include/GL/glew.h
index 035f0cd..872a5f9 100644
--- a/include/GL/glew.h
+++ b/include/GL/glew.h
@@ -154,10 +154,11 @@ typedef unsigned short wchar_t;
 #define APIENTRY
 #define GLEW_EXPORT
 
-#endif /* _WIN32 */
-
 /* <glu.h> */
 #define GLAPI extern
+#define GLAPIENTRY
+
+#endif /* _WIN32 */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/glew.c b/src/glew.c
index f82269e..dcf0ade 100644
--- a/src/glew.c
+++ b/src/glew.c
@@ -3365,7 +3365,7 @@ GLboolean glewExperimental = GL_FALSE;
 GLint glewInit ()
 {
   GLint r;
-  if (r = _glewInit()) return r;
+  if ( (r = _glewInit()) ) return r;
 #ifdef _WIN32
   return _wglewInit();
 #else /* _UNIX */
diff --git a/src/glewinfo.c b/src/glewinfo.c
index 34a2170..648d998 100644
--- a/src/glewinfo.c
+++ b/src/glewinfo.c
@@ -94,6 +94,7 @@
 */
 
 #include <stdio.h>
+#include <string.h>
 #include <GL/glew.h>
 #include <GL/glut.h>
 #include <GL/wglew.h>