diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed72434d80..3cfea2227f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ project(openmc Fortran C CXX)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/include)
 
 # Set module path
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
@@ -456,10 +455,7 @@ add_executable(${program} src/main.cpp)
 set_property(TARGET ${program} libopenmc pugixml_fortran
   PROPERTY LINKER_LANGUAGE Fortran)
 
-target_include_directories(libopenmc
-  PUBLIC include ${HDF5_INCLUDE_DIRS}
-  PRIVATE ${CMAKE_BINARY_DIR}/include
-  )
+target_include_directories(libopenmc PUBLIC include ${HDF5_INCLUDE_DIRS})
 
 # The executable and the faddeeva package use only one language.  They can be
 # set via target_compile_options which accepts a list.
diff --git a/docs/source/capi/index.rst b/docs/source/capi/index.rst
index 0e6a2536c6..fbc2830b56 100644
--- a/docs/source/capi/index.rst
+++ b/docs/source/capi/index.rst
@@ -270,13 +270,15 @@ Functions
 
    Reset tallies, timers, and pseudo-random number generator state
 
-.. c:function:: void openmc_init(const int* intracomm)
+.. c:function:: void openmc_init(int argc, char** argv, const void* intracomm)
 
    Initialize OpenMC
 
+   :param int argc: Number of command-line arguments (including command)
+   :param char** argv: Command-line arguments
    :param intracomm: MPI intracommunicator. If MPI is not being used, a null
                      pointer should be passed.
-   :type intracomm: const int*
+   :type intracomm: const void*
 
 .. c:function:: int openmc_load_nuclide(char name[])
 
diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index b0618818e3..f5b277a840 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -141,16 +141,10 @@ Prerequisites
       recommend that your HDF5 installation be built with parallel I/O
       features. An example of configuring HDF5_ is listed below::
 
-           FC=mpifort ./configure --enable-fortran --enable-parallel
+           FC=mpifort ./configure --enable-parallel
 
       You may omit ``--enable-parallel`` if you want to compile HDF5_ in serial.
 
-      .. important::
-
-          If you are building HDF5 version 1.8.x or earlier, you must include
-          ``--enable-fortran2003`` as well when configuring HDF5 or else OpenMC 
-          will not be able to compile.
-
 .. admonition:: Optional
    :class: note
 
diff --git a/src/math.F90 b/src/math.F90
index ee8cd0530b..20bacf88cf 100644
--- a/src/math.F90
+++ b/src/math.F90
@@ -598,7 +598,6 @@ contains
     real(8) :: zn_mat(n+1, n+1)        ! Matrix form of the coefficients which is
                                        ! easier to work with
     real(8) :: k1, k2, k3, k4          ! Variables for R_m_n calculation
-    real(8) :: sqrt_norm               ! normalization for radial moments
     integer :: i,p,q                   ! Loop counters
 
     real(8), parameter :: SQRT_N_1(0:10) = [&