diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9331cc6..caced1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ add_library(dfdutils OBJECT
         colourspaces.c
         dfd.h
         interpretdfd.c
+        KHR/khr_df.h
         printdfd.c
         queries.c
         vk2dfd.c
@@ -156,4 +157,4 @@ if(DOXYGEN_FOUND)
     )
 else()
     message(WARNING "Doxygen not found. 'doc' target will not be available.")
-endif()
\ No newline at end of file
+endif()
diff --git a/KHR/khr_df.h b/KHR/khr_df.h
index d3f8770..9400be3 100644
--- a/KHR/khr_df.h
+++ b/KHR/khr_df.h
@@ -14,8 +14,8 @@
 
 /* We stick to standard C89 constructs for simplicity and portability. */
 
-#ifndef _KHR_DATA_FORMAT_H_
-#define _KHR_DATA_FORMAT_H_
+#ifndef KHR_DATA_FORMAT_H_
+#define KHR_DATA_FORMAT_H_
 
 /* Accessors */
 typedef enum _khr_word_e {
diff --git a/dfd.h b/dfd.h
index d7f9965..d209e64 100644
--- a/dfd.h
+++ b/dfd.h
@@ -15,8 +15,8 @@
  * Author: Andrew Garrard
  */
 
-#ifndef _DFD_H_
-#define _DFD_H_
+#ifndef DFD_H_
+#define DFD_H_
 
 #include <KHR/khr_df.h>
 #include <stdbool.h>
@@ -233,4 +233,4 @@ bool getPrimaries(khr_df_primaries_e primaries, Primaries *p);
 }
 #endif
 
-#endif /* _DFD_H_ */
+#endif /* DFD_H_ */