diff --git a/ChangeLog b/ChangeLog
index 8ae7bbe3ac..a1362a6045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 23 11:41:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h: include "ruby/ruby.h" explicitly for
+	  enum ruby_fl_type and VALUE.
+
 Sat Oct 22 23:33:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (reg_compile_gen): always append error message to the
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 5b3ef484f5..e6ceb19cdf 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -20,6 +20,7 @@ extern "C" {
 #endif
 
 #include <stdarg.h>
+#include "ruby/ruby.h"
 #include "ruby/oniguruma.h"
 
 RUBY_SYMBOL_EXPORT_BEGIN