diff --git a/sample/chromium/font_subsetter.h b/sample/chromium/font_subsetter.h
index 07b1b5b..b891784 100644
--- a/sample/chromium/font_subsetter.h
+++ b/sample/chromium/font_subsetter.h
@@ -18,7 +18,7 @@
 #ifndef SFNTLY_CPP_SRC_TEST_FONT_SUBSETTER_H_
 #define SFNTLY_CPP_SRC_TEST_FONT_SUBSETTER_H_
 
-#include <cstddef>
+#include <stddef.h>
 
 class SfntlyWrapper {
  public:
diff --git a/sfntly/port/type.h b/sfntly/port/type.h
index 20a5ba8..9f82a5a 100644
--- a/sfntly/port/type.h
+++ b/sfntly/port/type.h
@@ -41,7 +41,7 @@
   #include <stdint.h>
 #endif
 
-#include <cstddef>
+#include <stddef.h>
 #include <vector>
 #include <set>
 
diff --git a/sfntly/table/bitmap/bitmap_glyph_info.cc b/sfntly/table/bitmap/bitmap_glyph_info.cc
index ab9953b..a299b3e 100644
--- a/sfntly/table/bitmap/bitmap_glyph_info.cc
+++ b/sfntly/table/bitmap/bitmap_glyph_info.cc
@@ -52,7 +52,7 @@
 
 bool BitmapGlyphInfo::operator==(BitmapGlyphInfo* rhs) {
   if (rhs == NULL) {
-    return this == NULL;
+    return false;  // Well defined C++ code's this is always not null.
   }
   return (format_ == rhs->format() &&
           glyph_id_ == rhs->glyph_id() &&