diff --git a/meson.build b/meson.build
index f477fce..c2a74c7 100644
--- a/meson.build
+++ b/meson.build
@@ -8,10 +8,26 @@
           'cpp_args=-Wno-unused-parameter'
         ])
 
+#-------------------------------------------------------------------------------
+# Compiler
+#-------------------------------------------------------------------------------
+
 cmplr = meson.get_compiler('cpp')
 
-# First, look if the libhei library has already been built and installed. If
-# not, default to the subproject.
+#-------------------------------------------------------------------------------
+# Include directories
+#-------------------------------------------------------------------------------
+
+# Only using the base directory. All header includes should provide the full
+# path from the base directory.
+incdir = include_directories('.')
+
+#-------------------------------------------------------------------------------
+# External library dependencies
+#-------------------------------------------------------------------------------
+
+# Look if the libhei library has already been built and installed. If not,
+# default to the subproject.
 libhei_dep = dependency('hei', fallback : ['libhei', 'libhei_dep'])
 
 sdbusplus_dep       = dependency('sdbusplus', version : '>=1.0')
@@ -19,8 +35,6 @@
 
 libpdbg_dep = cmplr.find_library('pdbg')
 
-incdir = include_directories('.')
-
 # See if phosphor-logging is available, if not use test case logging code. This
 # allows for local builds outside of CI test sandbox.
 h = 'phosphor-logging/log.hpp'
@@ -38,7 +52,7 @@
 lrt = declare_dependency(link_args : '-lrt')
 
 #-------------------------------------------------------------------------------
-# Build the static libraries
+# Build the local static libraries
 #-------------------------------------------------------------------------------
 
 subdir('analyzer')