diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eec22f4a0094bc521d6b7fe0b106aa2010be0ca9..e194baa55035f1df3eebbeae10f8a6925c94df2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,3 +14,16 @@ build-meson:
     - meson setup -Dgtk_doc=true _build
     - meson compile -C _build
     - meson test -C _build
+
+build-meson-nobackend:
+  image: fedora:latest
+  stage: build
+  before_script:
+    - dnf update -y
+    - dnf -y install
+      meson gcc dbus-devel glib2-devel gobject-introspection-devel
+      gtk3-devel rest-devel vala
+  script:
+    - meson setup -Dgtk_doc=false -Dgoabackend=false _build
+    - meson compile -C _build
+    - meson test -C _build
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index a91a4455652b93f1c4e1cf8b185088d7e6f606d2..e7c4934acdd8ddc8e21b2f63332e033498897780 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -503,36 +503,6 @@ GoaOAuth2ProviderPrivate
 goa_oauth2_provider_get_type
 </SECTION>
 
-<SECTION>
-<FILE>goaoauthprovider</FILE>
-GoaOAuthProvider
-GoaOAuthProviderClass
-goa_oauth_provider_get_request_uri
-goa_oauth_provider_get_request_uri_params
-goa_oauth_provider_get_authorization_uri
-goa_oauth_provider_get_token_uri
-goa_oauth_provider_get_callback_uri
-goa_oauth_provider_get_consumer_key
-goa_oauth_provider_get_consumer_secret
-goa_oauth_provider_build_authorization_uri
-goa_oauth_provider_get_use_mobile_browser
-goa_oauth_provider_is_deny_node
-goa_oauth_provider_is_identity_node
-goa_oauth_provider_is_password_node
-goa_oauth_provider_add_account_key_values
-goa_oauth_provider_get_identity_sync
-goa_oauth_provider_get_access_token_sync
-goa_oauth_provider_parse_request_token_error
-<SUBSECTION Standard>
-GOA_OAUTH_PROVIDER
-GOA_OAUTH_PROVIDER_CLASS
-GOA_OAUTH_PROVIDER_GET_CLASS
-GOA_IS_OAUTH_PROVIDER
-GOA_IS_OAUTH_PROVIDER_CLASS
-GOA_TYPE_OAUTH_PROVIDER
-goa_oauth_provider_get_type
-</SECTION>
-
 <SECTION>
 <FILE>GoaMail</FILE>
 GoaMail
diff --git a/meson.build b/meson.build
index 00d9fde9822e629d590c8d6d6dc69bdb624519da..f217141461ab40d76ec6fa9608791bfe47d6980a 100644
--- a/meson.build
+++ b/meson.build
@@ -102,13 +102,14 @@ if enable_goabackend
   libsecret_dep = dependency('libsecret-1')
   libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0', fallback: ['libsoup'])
   libxml_dep = dependency('libxml-2.0')
-  rest_dep = dependency('rest-1.0',
-    version: '>= 0.9.0',
-    fallback: ['librest', 'librest_dep'],
-    default_options: ['soup2=false', 'examples=false', 'tests=false', 'gtk_doc=false'],
-  )
   webkit_gtk_dep = dependency('webkit2gtk-4.1', version: '>= 2.33.1')
 endif
+rest_dep = dependency('rest-1.0',
+  version: '>= 0.9.0',
+  fallback: ['librest', 'librest_dep'],
+  required: enable_goabackend,
+  default_options: ['soup2=false', 'examples=false', 'tests=false', 'gtk_doc=false'],
+)
 config_h.set('GOA_BACKEND_ENABLED', enable_goabackend)
 
 enable_inspector = get_option('inspector')
@@ -129,7 +130,7 @@ config_h.set_quoted('GOA_FEDORA_NAME', 'fedora')
 config_h.set_quoted('GOA_FEDORA_REALM', 'FEDORAPROJECT.ORG')
 
 enable_fedora = get_option('fedora')
-if enable_fedora
+if enable_goabackend and enable_fedora
   gcr_dep = dependency('gcr-3')
   krb5_dep = dependency('krb5')
 
@@ -159,7 +160,7 @@ config_h.set('GOA_IMAP_SMTP_ENABLED', enable_imap_smtp)
 config_h.set_quoted('GOA_KERBEROS_NAME', 'kerberos')
 
 enable_kerberos = get_option('kerberos')
-if enable_kerberos
+if enable_goabackend and enable_kerberos
   gcr_dep = dependency('gcr-3')
   krb5_dep = dependency('krb5')
 
diff --git a/src/examples/meson.build b/src/examples/meson.build
index 34583296d32926a083cd6576d5a713d504e9ee5c..cef3062e18c1d9a7017a1b3a09437273751a3dd5 100644
--- a/src/examples/meson.build
+++ b/src/examples/meson.build
@@ -1,9 +1,10 @@
 programs = [
   # program name, deps
   ['list-accounts', libgoa_dep],
-  ['lastfm-shout', [libgoa_dep, rest_dep]]
 ]
-
+if rest_dep.found()
+  ['lastfm-shout', [libgoa_dep, rest_dep]]
+endif
 if enable_goabackend
   programs += [
     ['introspect-providers', libgoa_backend_dep],
@@ -16,6 +17,7 @@ foreach program: programs
     program[0],
     program[0] + '.c',
     include_directories: common_incs,
-    dependencies: program[1]
+    dependencies: program[1],
+    install: false,
   )
 endforeach
diff --git a/src/goaidentity/goakerberosidentityinquiry.c b/src/goaidentity/goakerberosidentityinquiry.c
index 42d52c5b4d7c69d04158f017fd43073220482fe1..ec2fc0188873089026f7b3d039f7b0f1fde06e3b 100644
--- a/src/goaidentity/goakerberosidentityinquiry.c
+++ b/src/goaidentity/goakerberosidentityinquiry.c
@@ -333,17 +333,17 @@ goa_kerberos_identity_query_get_mode (GoaIdentityInquiry * inquiry,
   GoaKerberosIdentityQuery *kerberos_query = (GoaKerberosIdentityQuery *) query;
 
   g_return_val_if_fail (GOA_IS_KERBEROS_IDENTITY_INQUIRY (inquiry),
-                        GOA_KERBEROS_IDENTITY_QUERY_MODE_INVISIBLE);
+                        GOA_IDENTITY_QUERY_MODE_INVISIBLE);
   g_return_val_if_fail (inquiry == kerberos_query->inquiry,
-                        GOA_KERBEROS_IDENTITY_QUERY_MODE_INVISIBLE);
+                        GOA_IDENTITY_QUERY_MODE_INVISIBLE);
 
   if (kerberos_query->kerberos_prompt->hidden)
     {
-      return GOA_KERBEROS_IDENTITY_QUERY_MODE_INVISIBLE;
+      return GOA_IDENTITY_QUERY_MODE_INVISIBLE;
     }
   else
     {
-      return GOA_KERBEROS_IDENTITY_QUERY_MODE_VISIBLE;
+      return GOA_IDENTITY_QUERY_MODE_VISIBLE;
     }
 }
 
@@ -354,7 +354,7 @@ goa_kerberos_identity_query_get_prompt (GoaIdentityInquiry * inquiry,
   GoaKerberosIdentityQuery *kerberos_query = (GoaKerberosIdentityQuery *) query;
 
   g_return_val_if_fail (GOA_IS_KERBEROS_IDENTITY_INQUIRY (inquiry),
-                        GOA_KERBEROS_IDENTITY_QUERY_MODE_INVISIBLE);
+                        GOA_IDENTITY_QUERY_MODE_INVISIBLE);
   g_return_val_if_fail (inquiry == kerberos_query->inquiry, NULL);
 
   return g_strdup (kerberos_query->kerberos_prompt->prompt);
@@ -367,7 +367,7 @@ goa_kerberos_identity_query_is_answered (GoaIdentityInquiry * inquiry,
   GoaKerberosIdentityQuery *kerberos_query = (GoaKerberosIdentityQuery *) query;
 
   g_return_val_if_fail (GOA_IS_KERBEROS_IDENTITY_INQUIRY (inquiry),
-                        GOA_KERBEROS_IDENTITY_QUERY_MODE_INVISIBLE);
+                        GOA_IDENTITY_QUERY_MODE_INVISIBLE);
   g_return_val_if_fail (inquiry == kerberos_query->inquiry, FALSE);
 
   return kerberos_query->is_answered;
diff --git a/src/goaidentity/goakerberosidentityinquiry.h b/src/goaidentity/goakerberosidentityinquiry.h
index 6181818cecd81014ccb51d7427f07de66b32d28c..febee126ee084d862ebc6392c87a59aa3bf648af 100644
--- a/src/goaidentity/goakerberosidentityinquiry.h
+++ b/src/goaidentity/goakerberosidentityinquiry.h
@@ -32,12 +32,6 @@ G_BEGIN_DECLS
 #define GOA_TYPE_KERBEROS_IDENTITY_INQUIRY (goa_kerberos_identity_inquiry_get_type ())
 G_DECLARE_FINAL_TYPE (GoaKerberosIdentityInquiry, goa_kerberos_identity_inquiry, GOA, KERBEROS_IDENTITY_INQUIRY, GObject);
 
-typedef enum
-{
-  GOA_KERBEROS_IDENTITY_QUERY_MODE_INVISIBLE,
-  GOA_KERBEROS_IDENTITY_QUERY_MODE_VISIBLE
-} GoaKerberosIdentityQueryMode;
-
 GoaIdentityInquiry *goa_kerberos_identity_inquiry_new (GoaKerberosIdentity *identity,
                                                        const char          *name,
                                                        const char          *banner,
diff --git a/src/meson.build b/src/meson.build
index d9a5d6567cac7fa0e6135a78e993762343cde8b2..a87e282e98b141caf1a30caeec060a93351e5a17 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,5 +11,6 @@ if enable_goabackend
 
   subdir('goabackend')
   subdir('daemon')
-  subdir('examples')
 endif
+
+subdir('examples')