diff --git a/buffet/buffet.gyp b/buffet/buffet.gyp
index ca2ddc7..db041dd 100644
--- a/buffet/buffet.gyp
+++ b/buffet/buffet.gyp
@@ -40,6 +40,9 @@
         'device_registration_info.cc',
         'manager.cc',
         'storage_impls.cc',
+        'states/error_codes.cc',
+        'states/state_manager.cc',
+        'states/state_package.cc',
         'utils.cc',
       ],
     },
@@ -105,6 +108,8 @@
             'commands/schema_utils_unittest.cc',
             'commands/unittest_utils.cc',
             'device_registration_info_unittest.cc',
+            'states/state_manager_unittest.cc',
+            'states/state_package_unittest.cc',
           ],
         },
       ],