diff --git a/packages/learn/src/pages/index.js b/packages/learn/src/pages/index.js
index c9ebfd781b..a1abdef516 100644
--- a/packages/learn/src/pages/index.js
+++ b/packages/learn/src/pages/index.js
@@ -1,8 +1,7 @@
-/* global graphql */
 /* eslint-disable max-len */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'gatsby';
+import { Link, graphql } from 'gatsby';
 import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
 
diff --git a/packages/learn/src/templates/Challenges/backend/Show.js b/packages/learn/src/templates/Challenges/backend/Show.js
index 738e9e9a9c..15ff59e2f2 100644
--- a/packages/learn/src/templates/Challenges/backend/Show.js
+++ b/packages/learn/src/templates/Challenges/backend/Show.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { createSelector } from 'reselect';
 import { reduxForm } from 'redux-form';
 import { Col, Row } from 'react-bootstrap';
+import { graphql } from 'gatsby';
 
 import ChallengeTitle from '../components/Challenge-Title';
 import ChallengeDescription from '../components/Challenge-Description';
diff --git a/packages/learn/src/templates/Challenges/classic/Show.js b/packages/learn/src/templates/Challenges/classic/Show.js
index dd2d78ab06..37dc172cca 100644
--- a/packages/learn/src/templates/Challenges/classic/Show.js
+++ b/packages/learn/src/templates/Challenges/classic/Show.js
@@ -1,4 +1,3 @@
-/* global graphql */
 import React, { Fragment, PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
@@ -6,6 +5,7 @@ import { createSelector } from 'reselect';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
 import { ReflexContainer, ReflexSplitter, ReflexElement } from 'react-reflex';
+import { graphql } from 'gatsby';
 
 import Editor from './Editor';
 import Preview from '../components/Preview';
diff --git a/packages/learn/src/templates/Challenges/project/Show.js b/packages/learn/src/templates/Challenges/project/Show.js
index e37226d59d..824e1bf9d2 100644
--- a/packages/learn/src/templates/Challenges/project/Show.js
+++ b/packages/learn/src/templates/Challenges/project/Show.js
@@ -1,7 +1,7 @@
-/* global graphql */
 import React, { PureComponent, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
+import { graphql } from 'gatsby';
 
 import Helmet from 'react-helmet';
 
diff --git a/packages/learn/src/templates/Introduction/Intro.js b/packages/learn/src/templates/Introduction/Intro.js
index ffbea3c199..32e2c30e55 100644
--- a/packages/learn/src/templates/Introduction/Intro.js
+++ b/packages/learn/src/templates/Introduction/Intro.js
@@ -1,7 +1,6 @@
-/* global graphql */
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { Link, navigate } from 'gatsby';
+import { Link, graphql, navigate } from 'gatsby';
 import Helmet from 'react-helmet';
 import { Button, ListGroup, ListGroupItem } from 'react-bootstrap';
 
diff --git a/packages/learn/src/templates/Introduction/SuperBlockIntro.js b/packages/learn/src/templates/Introduction/SuperBlockIntro.js
index 12155502e7..d72851fab9 100644
--- a/packages/learn/src/templates/Introduction/SuperBlockIntro.js
+++ b/packages/learn/src/templates/Introduction/SuperBlockIntro.js
@@ -1,7 +1,7 @@
-/* global graphql */
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
+import { graphql } from 'gatsby';
 
 import FullWidthRow from '../../components/util/FullWidthRow';
 import { MarkdownRemark } from '../../redux/propTypes';