diff --git a/doc/conf.py b/doc/conf.py
index a2795b59..5693e2d3 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -106,6 +106,8 @@ pygments_style = 'sphinx'
 
 highlight_language = 'c++'
 
+primary_domain = 'cpp'
+
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
diff --git a/doc/reference.rst b/doc/reference.rst
index 031fdc47..9cd986d6 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -93,7 +93,7 @@ Custom allocators
 
 The C++ Format library supports custom dynamic memory allocators.
 A custom allocator class can be specified as a template argument to
-:cpp:class:`fmt::BasicMemoryWriter`::
+:class:`fmt::BasicMemoryWriter`::
 
     typedef fmt::BasicMemoryWriter<char, CustomAllocator> CustomMemoryWriter;
 
diff --git a/format.h b/format.h
index abbe7097..8c84e441 100644
--- a/format.h
+++ b/format.h
@@ -1403,7 +1403,7 @@ class SystemError : public internal::RuntimeError {
  public:
   /**
    \rst
-   Constructs a :cpp:class:`fmt::SystemError` object with the description
+   Constructs a :class:`fmt::SystemError` object with the description
    of the form "*<message>*: *<system-message>*", where *<message>* is the
    formatted message and *<system-message>* is the system message corresponding
    to the error code.
@@ -1422,7 +1422,7 @@ class SystemError : public internal::RuntimeError {
   \rst
   This template provides operations for formatting and writing data into
   a character stream. The output is stored in a buffer provided by a subclass
-  such as :cpp:class:`fmt::BasicMemoryWriter`.
+  such as :class:`fmt::BasicMemoryWriter`.
 
   You can use one of the following typedefs for common character types:
 
@@ -2041,8 +2041,8 @@ class BasicMemoryWriter : public BasicWriter<Char> {
 
 #if FMT_USE_RVALUE_REFERENCES
   /**
-    Constructs a ``BasicMemoryWriter`` object moving the content of the other
-    object to it.
+    Constructs a :class:`fmt::BasicMemoryWriter` object moving the content
+    of the other object to it.
    */
   BasicMemoryWriter(BasicMemoryWriter &&other)
     : BasicWriter<Char>(buffer_), buffer_(std::move(other.buffer_)) {
@@ -2090,7 +2090,7 @@ class WindowsError : public SystemError {
  public:
   /**
    \rst
-   Constructs a :cpp:class:`fmt::WindowsError` object with the description
+   Constructs a :class:`fmt::WindowsError` object with the description
    of the form "*<message>*: *<system-message>*", where *<message>* is the
    formatted message and *<system-message>* is the system message corresponding
    to the error code.