diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc7c61c..8cb0e4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ add_library(athena-core
     include/athena/YAMLCommon.hpp
     include/athena/YAMLDocReader.hpp
     include/athena/YAMLDocWriter.hpp
-    include/yaml.h
+    include/athena/yaml.h
     include/athena/utf8proc.h
 )
 if(WIN32)
@@ -214,7 +214,7 @@ else()
         if(GEKKO OR NX)
             target_sources(athena-core PRIVATE
                 src/gekko_support.c
-                include/gekko_support.h
+                include/athena/gekko_support.h
             )
         endif()
     endif()
diff --git a/atdna/CMakeLists.txt b/atdna/CMakeLists.txt
index c39bea1..7707947 100644
--- a/atdna/CMakeLists.txt
+++ b/atdna/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ATDNA Build #
 ###############
 
-if(NOT CMAKE_CROSSCOMPILING)
+if(NOT TARGET atdna AND NOT CMAKE_CROSSCOMPILING)
 
 get_directory_property(ATDNA_DEFINES COMPILE_DEFINITIONS)
 list(REMOVE_ITEM ATDNA_DEFINES _GLIBCXX_DEBUG=1)
@@ -149,6 +149,6 @@ endif()
 
 endif()
 
-include(atdnaHelpers.cmake)
-
 endif()
+
+include(atdnaHelpers.cmake)
diff --git a/extern/yaml/src/yaml_private.h b/extern/yaml/src/yaml_private.h
index 7430459..c57709a 100644
--- a/extern/yaml/src/yaml_private.h
+++ b/extern/yaml/src/yaml_private.h
@@ -1,7 +1,7 @@
 
 #include "config.h"
 
-#include <yaml.h>
+#include <athena/yaml.h>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/include/athena/YAMLCommon.hpp b/include/athena/YAMLCommon.hpp
index 5966d01..4809385 100644
--- a/include/athena/YAMLCommon.hpp
+++ b/include/athena/YAMLCommon.hpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <yaml.h>
+#include "yaml.h"
 
 #include "athena/Types.hpp"
 
diff --git a/include/gekko_support.h b/include/athena/gekko_support.h
similarity index 100%
rename from include/gekko_support.h
rename to include/athena/gekko_support.h
diff --git a/include/yaml.h b/include/athena/yaml.h
similarity index 100%
rename from include/yaml.h
rename to include/athena/yaml.h
diff --git a/src/gekko_support.c b/src/gekko_support.c
index dd06203..62aced6 100644
--- a/src/gekko_support.c
+++ b/src/gekko_support.c
@@ -1,5 +1,5 @@
 #if defined(GEKKO) || defined(__SWITCH__)
-#include "gekko_support.h"
+#include "athena/gekko_support.h"
 #define SYMLOOP_MAX 8
 #include <sys/stat.h>
 #include <sys/param.h>