diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md
index 60bf41ea65..0fc49e8ba7 100644
--- a/CODING_GUIDELINES.md
+++ b/CODING_GUIDELINES.md
@@ -277,7 +277,7 @@ To test if something is a string, consider that it may be unicode.
     if type(x) == str:
 
     # yes
-    from ansible.compat.six import string_types
+    from ansible.module_utils.six import string_types
     if isinstance(x, string_types):
 
 Cleverness
diff --git a/docs/api/Makefile b/docs/api/Makefile
index 67203e4385..c16e455282 100644
--- a/docs/api/Makefile
+++ b/docs/api/Makefile
@@ -14,7 +14,7 @@ PAPER         =
 BUILDDIR      = _build
 RSTDIR        = rst
 MODULES_PATH  = ../../lib
-EXCLUDE_PATHS = ../../lib/ansible/modules ../../lib/ansible/utils/module_docs_fragments ../../lib/ansible/compat/six ../../lib/ansible/module_utils/six.py
+EXCLUDE_PATHS = ../../lib/ansible/modules ../../lib/ansible/utils/module_docs_fragments ../../lib/ansible/module_utils/six
 DOC_PROJECTS  = "Ansible API"
 
 # User-friendly check for sphinx-build