diff --git a/.styleguide b/.styleguide
index 8f73663169..c3b51b70fb 100644
--- a/.styleguide
+++ b/.styleguide
@@ -1,18 +1,14 @@
-cppHeaderExtensions {
-  h
-  hpp
-  inc
+cppHeaderFileInclude {
+  \.h$
+  \.hpp$
+  \.inc$
 }
 
-cppSrcExtensions {
-  cpp
+cppSrcFileInclude {
+  \.cpp$
 }
 
-otherExtensions {
-  java
-}
-
-genFileExclude {
+generatedFileExclude {
   gmock/
   src/arm-linux-jni/
   src/main/native/cpp/jni/CameraServerJNI\.cpp$