diff --git a/CMakeLists.txt b/CMakeLists.txt
index b870760..7c23b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ add_library(AthenaSakura EXCLUDE_FROM_ALL
     src/Athena/SpriteFrame.cpp
     src/Athena/SpritePart.cpp
 
+    include/Athena/SakuraGlobal.hpp
     include/Athena/Sprite.hpp
     include/Athena/SpriteFile.hpp
     include/Athena/SpriteFileReader.hpp
diff --git a/include/Athena/ALTTPEnums.hpp b/include/Athena/ALTTPEnums.hpp
index 6d5ae41..c7cc0ef 100644
--- a/include/Athena/ALTTPEnums.hpp
+++ b/include/Athena/ALTTPEnums.hpp
@@ -1,23 +1,6 @@
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef ALTTP_ENUMS_HPP
 #define ALTTP_ENUMS_HPP
 
-#ifndef __DOXYGEN_IGNORE__
-
 #include "Types.hpp"
 
 namespace Athena
@@ -109,5 +92,4 @@ enum ALTTPTagAlong
 };
 
 } // zelda
-#endif // __DOXYGEN_IGNORE__
 #endif // ALTTP_ENUMS_HPP
diff --git a/include/Athena/ALTTPFile.hpp b/include/Athena/ALTTPFile.hpp
index 929a749..a9c8af3 100644
--- a/include/Athena/ALTTPFile.hpp
+++ b/include/Athena/ALTTPFile.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef ALTTP_FILE_HPP
 #define ALTTP_FILE_HPP
 
@@ -90,4 +74,3 @@ private:
 
 } // zelda
 #endif // ALTTP_FILE_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/ALTTPFileReader.hpp b/include/Athena/ALTTPFileReader.hpp
index aedd6f2..b6ddce5 100644
--- a/include/Athena/ALTTPFileReader.hpp
+++ b/include/Athena/ALTTPFileReader.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef ALTTP_FILE_READER_HPP
 #define ALTTP_FILE_READER_HPP
 
@@ -67,4 +51,3 @@ private:
 } // io
 } // zelda
 #endif // ALTTP_FILE_READER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/ALTTPFileWriter.hpp b/include/Athena/ALTTPFileWriter.hpp
index e95b1dc..501ae87 100644
--- a/include/Athena/ALTTPFileWriter.hpp
+++ b/include/Athena/ALTTPFileWriter.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef ALTTP_FILE_WRITER_HPP
 #define ALTTP_FILE_WRITER_HPP
 
@@ -69,4 +53,3 @@ private:
 } // zelda
 
 #endif // ALTTP_FILE_WRITER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/ALTTPQuest.hpp b/include/Athena/ALTTPQuest.hpp
index 3a11ce4..e5cd3ac 100644
--- a/include/Athena/ALTTPQuest.hpp
+++ b/include/Athena/ALTTPQuest.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef ALTTP_QUEST_HPP
 #define ALTTP_QUEST_HPP
 
@@ -686,4 +670,3 @@ private:
 } // zelda
 
 #endif // ALTTP_QUEST_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/ALTTPStructs.hpp b/include/Athena/ALTTPStructs.hpp
index 5c30e99..58fc1c1 100644
--- a/include/Athena/ALTTPStructs.hpp
+++ b/include/Athena/ALTTPStructs.hpp
@@ -1,23 +1,6 @@
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef ALTTP_STRUCTS_HPP
 #define ALTTP_STRUCTS_HPP
 
-#ifndef __DOXYGEN_IGNORE__
-
 #include <string>
 #include "Athena/Types.hpp"
 
@@ -214,5 +197,4 @@ struct ALTTPProgressFlags2
 
 }
 
-#endif // __DOXYGEN_IGNORE__
 #endif // ALTTP_STRUCTS_HPP
diff --git a/include/Athena/Global.hpp b/include/Athena/Global.hpp
index bba4a9e..ae9ca66 100644
--- a/include/Athena/Global.hpp
+++ b/include/Athena/Global.hpp
@@ -82,34 +82,6 @@ enum Endian
     LittleEndian,
     BigEndian
 };
-
-#ifndef ATHENA_NO_SAKURA
-namespace Sakura
-{
-template <typename T>
-class Vector2D
-{
-public:
-    T x;
-    T y;
-
-    Vector2D()
-        : x(0),
-          y(0)
-    {
-    }
-
-    Vector2D(T x, T y)
-        : x(x),
-          y(y)
-    {
-    }
-};
-
-typedef Vector2D<int> Vector2Di;
-typedef Vector2D<float> Vector2Df;
-} // Sakura
-#endif // ATHENA_NO_SAKURA
 } // Athena
 
 typedef void (*atEXCEPTION_HANDLER)(const Athena::error::Level& level, const char* file, const char* function, int line, const char* fmt, ...);
diff --git a/include/Athena/MCFile.hpp b/include/Athena/MCFile.hpp
index c03d88f..c5fc93a 100644
--- a/include/Athena/MCFile.hpp
+++ b/include/Athena/MCFile.hpp
@@ -1,18 +1,3 @@
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef MCFILE_HPP
 #define MCFILE_HPP
 
diff --git a/include/Athena/MCFileReader.hpp b/include/Athena/MCFileReader.hpp
index 38f15c7..739de6d 100644
--- a/include/Athena/MCFileReader.hpp
+++ b/include/Athena/MCFileReader.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef MCFILEREADER_HPP
 #define MCFILEREADER_HPP
 
@@ -65,4 +49,3 @@ public:
 } // zelda
 
 #endif // MCFILEREADER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/MCFileWriter.hpp b/include/Athena/MCFileWriter.hpp
index d3dbc82..c2987cd 100644
--- a/include/Athena/MCFileWriter.hpp
+++ b/include/Athena/MCFileWriter.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef MCFILEWRITER_HPP
 #define MCFILEWRITER_HPP
 
@@ -70,4 +54,3 @@ private:
 } // zelda
 
 #endif // MCFILEWRITER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/SakuraGlobal.hpp b/include/Athena/SakuraGlobal.hpp
new file mode 100644
index 0000000..51a7a76
--- /dev/null
+++ b/include/Athena/SakuraGlobal.hpp
@@ -0,0 +1,35 @@
+#ifndef SAKURAGLOBAL_HPP
+#define SAKURAGLOBAL_HPP
+
+#include "Athena/Global.hpp"
+
+namespace Athena
+{
+namespace Sakura
+{
+template <typename T>
+class Vector2D
+{
+public:
+    T x;
+    T y;
+
+    Vector2D()
+        : x(0),
+          y(0)
+    {
+    }
+
+    Vector2D(T x, T y)
+        : x(x),
+          y(y)
+    {
+    }
+};
+
+typedef Vector2D<int> Vector2Di;
+typedef Vector2D<float> Vector2Df;
+} // Sakura
+} // Athena
+
+#endif // SAKURAGLOBAL_HPP
diff --git a/include/Athena/SkywardSwordFile.hpp b/include/Athena/SkywardSwordFile.hpp
index 48ab379..93a1a15 100644
--- a/include/Athena/SkywardSwordFile.hpp
+++ b/include/Athena/SkywardSwordFile.hpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSFILE_HPP
 #define SSFILE_HPP
 
@@ -63,4 +47,3 @@ private:
 
 }
 #endif // SSFILE_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/SkywardSwordFileReader.hpp b/include/Athena/SkywardSwordFileReader.hpp
index fde16f6..8290f39 100644
--- a/include/Athena/SkywardSwordFileReader.hpp
+++ b/include/Athena/SkywardSwordFileReader.hpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSFILEREADER_HPP
 #define SSFILEREADER_HPP
 
@@ -38,4 +22,3 @@ public:
 } // zelda
 
 #endif // SSFILEREADER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/SkywardSwordFileWriter.hpp b/include/Athena/SkywardSwordFileWriter.hpp
index 65f38ce..5af7f0c 100644
--- a/include/Athena/SkywardSwordFileWriter.hpp
+++ b/include/Athena/SkywardSwordFileWriter.hpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSFILEWRITER_HPP
 #define SSFILEWRITER_HPP
 
@@ -38,4 +22,3 @@ public:
 }
 }
 #endif // SSFILEWRITER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/SkywardSwordQuest.hpp b/include/Athena/SkywardSwordQuest.hpp
index c7c4b8b..fb22434 100644
--- a/include/Athena/SkywardSwordQuest.hpp
+++ b/include/Athena/SkywardSwordQuest.hpp
@@ -1,76 +1,59 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-    // This file is part of libAthena.
-    //
-    // libAthena is free software: you can redistribute it and/or modify
-    // it under the terms of the GNU General Public License as published by
-    // the Free Software Foundation, either version 3 of the License, or
-    // (at your option) any later version.
-    //
-    // libAthena is distributed in the hope that it will be useful,
-    // but WITHOUT ANY WARRANTY; without even the implied warranty of
-    // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    // GNU General Public License for more details.
-    //
-    // You should have received a copy of the GNU General Public License
-    // along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
-#ifndef SKYWARDSWORDQUEST_HPP
+#ifndef SKYWARDSWORDQUEST_HPP
 #define SKYWARDSWORDQUEST_HPP
 
 #include "Athena/Global.hpp"
 #include "Athena/ZQuestFile.hpp"
 
-    namespace Athena
+namespace Athena
+{
+
+// TODO: Handle game specific data
+class SkywardSwordQuest : public ZQuestFile
+{
+public:
+    enum AmmoType
     {
-
-    // TODO: Handle game specific data
-    class SkywardSwordQuest : public ZQuestFile
-    {
-    public:
-        enum AmmoType
-        {
-            Arrows,
-            Bombs,
-            Seeds
-        };
-
-        SkywardSwordQuest(std::unique_ptr<atUint8[]>&& data, atUint32 len);
-
-        void setPlayerName(const std::string& name);
-        std::string playerName() const;
-
-        void setRupeeCount(atUint16 value);
-        atUint16 rupeeCount();
-        void setAmmoCount(AmmoType type, atUint32 count);
-        atUint32 ammoCount(AmmoType type);
-        void setMaxHP(atUint16 val);
-        atUint16 maxHP();
-        float maxHearts();
-        void setSpawnHP(atUint16 val);
-        atUint16 spawnHP();
-        float spawnHearts();
-        void setCurrentHP(atUint16 val);
-        atUint16 currentHP();
-        float currentHearts();
-        std::string currentLocation();
-        std::string currentArea();
-        std::string currentLocationCopy();
-
-        void setSkipData(std::unique_ptr<atUint8[]>&& data);
-        atUint8* skipData() const;
-
-
-        atUint32 slotChecksum();
-        atUint32 skipChecksum();
-        void fixChecksums();
-
-        void setNew(bool isNew);
-        bool isNew() const;
-    private:
-        std::unique_ptr<atUint8[]> m_skipData;
+        Arrows,
+        Bombs,
+        Seeds
     };
 
+    SkywardSwordQuest(std::unique_ptr<atUint8[]>&& data, atUint32 len);
 
-    } // zelda
+    void setPlayerName(const std::string& name);
+    std::string playerName() const;
+
+    void setRupeeCount(atUint16 value);
+    atUint16 rupeeCount();
+    void setAmmoCount(AmmoType type, atUint32 count);
+    atUint32 ammoCount(AmmoType type);
+    void setMaxHP(atUint16 val);
+    atUint16 maxHP();
+    float maxHearts();
+    void setSpawnHP(atUint16 val);
+    atUint16 spawnHP();
+    float spawnHearts();
+    void setCurrentHP(atUint16 val);
+    atUint16 currentHP();
+    float currentHearts();
+    std::string currentLocation();
+    std::string currentArea();
+    std::string currentLocationCopy();
+
+    void setSkipData(std::unique_ptr<atUint8[]>&& data);
+    atUint8* skipData() const;
+
+
+    atUint32 slotChecksum();
+    atUint32 skipChecksum();
+    void fixChecksums();
+
+    void setNew(bool isNew);
+    bool isNew() const;
+private:
+    std::unique_ptr<atUint8[]> m_skipData;
+};
+
+
+} // Athena
 #endif // SSQUEST_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/Sprite.hpp b/include/Athena/Sprite.hpp
index baa39df..fefa07f 100644
--- a/include/Athena/Sprite.hpp
+++ b/include/Athena/Sprite.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSPRITE_HPP
 #define SSPRITE_HPP
 
@@ -26,7 +10,7 @@
 #include <QString>
 #include <QList>
 #endif
-#include "Athena/Global.hpp"
+#include "Athena/SakuraGlobal.hpp"
 
 namespace Athena
 {
@@ -144,4 +128,3 @@ Q_DECLARE_METATYPE(Athena::Sakura::Sprite*)
 #endif
 
 #endif // SSPRITE_HPP
-#endif // ATHENA_NO_SAKURA
diff --git a/include/Athena/SpriteFile.hpp b/include/Athena/SpriteFile.hpp
index 23ae089..84f9308 100644
--- a/include/Athena/SpriteFile.hpp
+++ b/include/Athena/SpriteFile.hpp
@@ -1,20 +1,4 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
-#ifndef SSPRITEFILE_HPP
+#ifndef SSPRITEFILE_HPP
 #define SSPRITEFILE_HPP
 
 #ifndef ATHENA_USE_QT
@@ -29,7 +13,7 @@
 #endif
 
 #include <string>
-#include "Athena/Global.hpp"
+#include "Athena/SakuraGlobal.hpp"
 
 namespace Athena
 {
@@ -279,6 +263,3 @@ Q_DECLARE_METATYPE(Athena::Sakura::SpriteFile*)
 Q_DECLARE_METATYPE(Athena::Sakura::STexture*)
 #endif
 #endif // SSPRITE_HPP
-
-#endif // ATHENA_NO_SAKURA
-
diff --git a/include/Athena/SpriteFileReader.hpp b/include/Athena/SpriteFileReader.hpp
index 70f3fdc..7b2e6fd 100644
--- a/include/Athena/SpriteFileReader.hpp
+++ b/include/Athena/SpriteFileReader.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSPRITEFILEREADER_HPP
 #define SSPRITEFILEREADER_HPP
 
@@ -43,4 +27,3 @@ public:
 
 
 #endif // SSPRITEFILEREADER_HPP
-#endif // ATHENA_NO_SAKURA
diff --git a/include/Athena/SpriteFileWriter.hpp b/include/Athena/SpriteFileWriter.hpp
index 36d0e46..eb138d7 100644
--- a/include/Athena/SpriteFileWriter.hpp
+++ b/include/Athena/SpriteFileWriter.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSPRITEFILEWRITER_HPP
 #define SSPRITEFILEWRITER_HPP
 
@@ -43,4 +27,3 @@ public:
 } // io
 } // zelda
 #endif // SSPRITEFILEWRITER_HPP
-#endif // ATHENA_NO_SAKURA
diff --git a/include/Athena/SpriteFrame.hpp b/include/Athena/SpriteFrame.hpp
index adde8c4..7e46cac 100644
--- a/include/Athena/SpriteFrame.hpp
+++ b/include/Athena/SpriteFrame.hpp
@@ -1,24 +1,8 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSPRITEFRAME_HPP
 #define SSPRITEFRAME_HPP
 
 
-#include "Athena/Global.hpp"
+#include "Athena/SakuraGlobal.hpp"
 
 #ifndef ATHENA_USE_QT
 #include <vector>
@@ -98,4 +82,3 @@ Q_DECLARE_METATYPE(Athena::Sakura::SpriteFrame*);
 #endif
 
 #endif // SSPRITEFRAME_HPP
-#endif // ATHENA_NO_SAKURA
diff --git a/include/Athena/SpritePart.hpp b/include/Athena/SpritePart.hpp
index 9cb1b1f..02af17d 100644
--- a/include/Athena/SpritePart.hpp
+++ b/include/Athena/SpritePart.hpp
@@ -1,23 +1,7 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef SSPRITEPART_HPP
 #define SSPRITEPART_HPP
 
-#include "Athena/Global.hpp"
+#include "Athena/SakuraGlobal.hpp"
 #ifndef ATHENA_USE_QT
 #   include <vector>
 #else
@@ -214,4 +198,3 @@ Q_DECLARE_METATYPE(Athena::Sakura::SpritePart*)
 #endif
 
 #endif // SSPRITEPART_HPP
-#endif // ATHENA_NO_SAKURA
diff --git a/include/Athena/WiiBanner.hpp b/include/Athena/WiiBanner.hpp
index d0ca84e..f96694f 100644
--- a/include/Athena/WiiBanner.hpp
+++ b/include/Athena/WiiBanner.hpp
@@ -1,23 +1,6 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef WIIBANNER_H
 #define WIIBANNER_H
 
-
 #include <vector>
 #include <string>
 #include "Athena/Global.hpp"
@@ -191,4 +174,3 @@ private:
 } // zelda
 
 #endif // WIIBANNER_H
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/WiiFile.hpp b/include/Athena/WiiFile.hpp
index c029a6b..84612fa 100644
--- a/include/Athena/WiiFile.hpp
+++ b/include/Athena/WiiFile.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef WIIFILE_H
 #define WIIFILE_H
 
@@ -236,4 +220,3 @@ private:
 
 } // zelda
 #endif // WIIFILE_H
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/WiiImage.hpp b/include/Athena/WiiImage.hpp
index 46dcaff..4343787 100644
--- a/include/Athena/WiiImage.hpp
+++ b/include/Athena/WiiImage.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef WIIIMAGE_HPP
 #define WIIIMAGE_HPP
 
@@ -92,4 +76,3 @@ private:
 } // zelda
 
 #endif // WIIIMAGE_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/WiiSave.hpp b/include/Athena/WiiSave.hpp
index 55648a1..e86d6e0 100644
--- a/include/Athena/WiiSave.hpp
+++ b/include/Athena/WiiSave.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef WIISAVE_HPP
 #define WIISAVE_HPP
 
@@ -98,5 +82,3 @@ private:
 
 } // zelda
 #endif // WIISAVE_HPP
-#endif // ATHENA_NO_SAVES
-
diff --git a/include/Athena/WiiSaveReader.hpp b/include/Athena/WiiSaveReader.hpp
index bb819b7..b6cbb7a 100644
--- a/include/Athena/WiiSaveReader.hpp
+++ b/include/Athena/WiiSaveReader.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef WIISAVEREADER_HPP
 #define WIISAVEREADER_HPP
 
@@ -70,4 +54,3 @@ private:
 } // io
 } // zelda
 #endif // WIISAVEREADER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/include/Athena/WiiSaveWriter.hpp b/include/Athena/WiiSaveWriter.hpp
index 93a381e..0621400 100644
--- a/include/Athena/WiiSaveWriter.hpp
+++ b/include/Athena/WiiSaveWriter.hpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #ifndef WIISAVEWRITER_HPP
 #define WIISAVEWRITER_HPP
 
@@ -69,4 +53,3 @@ private:
 } // io
 } // zelda
 #endif // WIISAVEWRITER_HPP
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/ALTTPFile.cpp b/src/Athena/ALTTPFile.cpp
index c22921b..ea15555 100644
--- a/src/Athena/ALTTPFile.cpp
+++ b/src/Athena/ALTTPFile.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ALTTPFile.hpp"
 #include "Athena/ALTTPQuest.hpp"
 
@@ -59,5 +43,3 @@ atUint32 ALTTPFile::questCount() const
     return (atUint32)m_quests.size();
 }
 } // zelda
-
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/ALTTPFileReader.cpp b/src/Athena/ALTTPFileReader.cpp
index 51bd565..50cee9f 100644
--- a/src/Athena/ALTTPFileReader.cpp
+++ b/src/Athena/ALTTPFileReader.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ALTTPFileReader.hpp"
 #include "Athena/ALTTPFile.hpp"
 #include "Athena/ALTTPQuest.hpp"
@@ -253,5 +237,3 @@ ALTTPDungeonItemFlags ALTTPFileReader::readDungeonFlags()
 
 } // io
 } // zelda
-
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/ALTTPFileWriter.cpp b/src/Athena/ALTTPFileWriter.cpp
index 11703d2..42c8d50 100644
--- a/src/Athena/ALTTPFileWriter.cpp
+++ b/src/Athena/ALTTPFileWriter.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ALTTPFileWriter.hpp"
 #include "Athena/ALTTPFile.hpp"
 #include "Athena/ALTTPQuest.hpp"
@@ -237,4 +221,3 @@ atUint16 ALTTPFileWriter::calculateChecksum(atUint32 game)
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/ALTTPQuest.cpp b/src/Athena/ALTTPQuest.cpp
index 1b72bdd..b45f3ba 100644
--- a/src/Athena/ALTTPQuest.cpp
+++ b/src/Athena/ALTTPQuest.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ALTTPQuest.hpp"
 #include <iostream>
 
@@ -761,4 +745,3 @@ atUint16 ALTTPQuest::checksum() const
 }
 
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/MCFile.cpp b/src/Athena/MCFile.cpp
index 8839986..1ebf34e 100644
--- a/src/Athena/MCFile.cpp
+++ b/src/Athena/MCFile.cpp
@@ -1,18 +1,3 @@
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/MCFile.hpp"
 
 namespace Athena
diff --git a/src/Athena/MCFileReader.cpp b/src/Athena/MCFileReader.cpp
index eb6fed3..df16207 100644
--- a/src/Athena/MCFileReader.cpp
+++ b/src/Athena/MCFileReader.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/MCFileReader.hpp"
 #include "Athena/MCFile.hpp"
 namespace Athena
@@ -47,4 +31,3 @@ MCFile* MCFileReader::readFile()
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/MCFileWriter.cpp b/src/Athena/MCFileWriter.cpp
index 9eb89c9..21c5474 100644
--- a/src/Athena/MCFileWriter.cpp
+++ b/src/Athena/MCFileWriter.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/MCFileWriter.hpp"
 
 namespace Athena
@@ -66,4 +50,3 @@ atUint16 MCFileWriter::calculateChecksum(atUint8* data, atUint32 length)
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/SkywardSwordFile.cpp b/src/Athena/SkywardSwordFile.cpp
index 4b15a5f..160808d 100644
--- a/src/Athena/SkywardSwordFile.cpp
+++ b/src/Athena/SkywardSwordFile.cpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SkywardSwordFile.hpp"
 #include "Athena/SkywardSwordQuest.hpp"
 
@@ -72,4 +56,3 @@ Region SkywardSwordFile::region() const
 
 
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/SkywardSwordFileReader.cpp b/src/Athena/SkywardSwordFileReader.cpp
index 795cdac..26c527d 100644
--- a/src/Athena/SkywardSwordFileReader.cpp
+++ b/src/Athena/SkywardSwordFileReader.cpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SkywardSwordFileReader.hpp"
 #include "Athena/SkywardSwordFile.hpp"
 #include "Athena/SkywardSwordQuest.hpp"
@@ -83,4 +67,3 @@ SkywardSwordFile* SkywardSwordFileReader::read()
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/SkywardSwordFileWriter.cpp b/src/Athena/SkywardSwordFileWriter.cpp
index 249b7e1..1506147 100644
--- a/src/Athena/SkywardSwordFileWriter.cpp
+++ b/src/Athena/SkywardSwordFileWriter.cpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SkywardSwordFileWriter.hpp"
 #include "Athena/SkywardSwordFile.hpp"
 #include "Athena/SkywardSwordQuest.hpp"
@@ -80,4 +64,3 @@ void SkywardSwordFileWriter::write(SkywardSwordFile* file)
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/SkywardSwordQuest.cpp b/src/Athena/SkywardSwordQuest.cpp
index fdabef1..2a0d4a8 100644
--- a/src/Athena/SkywardSwordQuest.cpp
+++ b/src/Athena/SkywardSwordQuest.cpp
@@ -1,19 +1,3 @@
-#if !defined(ATHENA_NO_SAVES) && !defined(ATHENA_NO_ZQUEST)
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SkywardSwordQuest.hpp"
 #include "Athena/Checksums.hpp"
 #include "utf8proc.h"
@@ -276,4 +260,3 @@ bool SkywardSwordQuest::isNew() const
 }
 
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/Sprite.cpp b/src/Athena/Sprite.cpp
index df05171..203f51e 100644
--- a/src/Athena/Sprite.cpp
+++ b/src/Athena/Sprite.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/Sprite.hpp"
 #include "Athena/SpriteFrame.hpp"
 #include "Athena/SpriteFile.hpp"
@@ -316,5 +300,3 @@ SpriteFile* Sprite::root() const
 }
 }
 }
-
-#endif // ATHENA_NO_SAKURA
diff --git a/src/Athena/SpriteFile.cpp b/src/Athena/SpriteFile.cpp
index e5abf75..42f48c7 100644
--- a/src/Athena/SpriteFile.cpp
+++ b/src/Athena/SpriteFile.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SpriteFile.hpp"
 #include "Athena/Sprite.hpp"
 #include "Athena/Utility.hpp"
@@ -342,5 +326,3 @@ void SpriteFile::setTextures(QList<STexture*> textures)
 #endif
 } // Sakura
 } // zelda
-
-#endif // ATHENA_NO_SAKURA
diff --git a/src/Athena/SpriteFileReader.cpp b/src/Athena/SpriteFileReader.cpp
index 57e2e75..6ed6be6 100644
--- a/src/Athena/SpriteFileReader.cpp
+++ b/src/Athena/SpriteFileReader.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SpriteFileReader.hpp"
 #include "Athena/SpriteFile.hpp"
 #include "Athena/Sprite.hpp"
@@ -222,4 +206,3 @@ Sakura::SpriteFile* SpriteFileReader::readFile()
 }
 } // io
 } // zelda
-#endif //ATHENA_NO_SAKURA
diff --git a/src/Athena/SpriteFileWriter.cpp b/src/Athena/SpriteFileWriter.cpp
index dd9c14d..a0cae2f 100644
--- a/src/Athena/SpriteFileWriter.cpp
+++ b/src/Athena/SpriteFileWriter.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SpriteFileWriter.hpp"
 #include "Athena/SpriteFile.hpp"
 #include "Athena/Sprite.hpp"
@@ -118,4 +102,3 @@ void SpriteFileWriter::writeFile(Sakura::SpriteFile* file)
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAKURA
diff --git a/src/Athena/SpriteFrame.cpp b/src/Athena/SpriteFrame.cpp
index 7d07dd6..2a7ad13 100644
--- a/src/Athena/SpriteFrame.cpp
+++ b/src/Athena/SpriteFrame.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SpriteFrame.hpp"
 #include "Athena/SpritePart.hpp"
 #include "Athena/Sprite.hpp"
@@ -81,4 +65,3 @@ Sprite* SpriteFrame::root() const
 
 } // Sakura
 } // zelda
-#endif // ATHENA_NO_SAKURA
diff --git a/src/Athena/SpritePart.cpp b/src/Athena/SpritePart.cpp
index e5af3fd..f4dae05 100644
--- a/src/Athena/SpritePart.cpp
+++ b/src/Athena/SpritePart.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAKURA
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/SpritePart.hpp"
 #include "Athena/SpritePart.hpp"
 #include "Athena/Sprite.hpp"
@@ -201,4 +185,3 @@ SpriteFrame* SpritePart::root() const
 }
 }
 }
-#endif // ATHENA_NO_SAKURA
diff --git a/src/Athena/WiiBanner.cpp b/src/Athena/WiiBanner.cpp
index 66a38df..5a65e3b 100644
--- a/src/Athena/WiiBanner.cpp
+++ b/src/Athena/WiiBanner.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/WiiBanner.hpp"
 #include "Athena/WiiImage.hpp"
 
@@ -157,4 +141,3 @@ atUint32 WiiBanner::flags() const
 }
 
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/WiiFile.cpp b/src/Athena/WiiFile.cpp
index 14acee3..906a398 100644
--- a/src/Athena/WiiFile.cpp
+++ b/src/Athena/WiiFile.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/WiiFile.hpp"
 #include <algorithm>
 
@@ -290,4 +274,3 @@ std::string WiiFile::fullpath()
 }
 
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/WiiImage.cpp b/src/Athena/WiiImage.cpp
index 889a396..067997a 100644
--- a/src/Athena/WiiImage.cpp
+++ b/src/Athena/WiiImage.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/WiiImage.hpp"
 #include "Athena/Utility.hpp"
 #include <string.h>
@@ -98,4 +82,3 @@ atUint8* WiiImage::toRGBA()
 }
 
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/WiiSave.cpp b/src/Athena/WiiSave.cpp
index 690e16a..b46ce0a 100644
--- a/src/Athena/WiiSave.cpp
+++ b/src/Athena/WiiSave.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/WiiSave.hpp"
 #include "Athena/WiiFile.hpp"
 #include "Athena/WiiBanner.hpp"
@@ -103,5 +87,3 @@ std::vector<WiiFile*> WiiSave::allFiles() const
 }
 
 } // zelda
-
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/WiiSaveReader.cpp b/src/Athena/WiiSaveReader.cpp
index 0d9c84d..ad8c282 100644
--- a/src/Athena/WiiSaveReader.cpp
+++ b/src/Athena/WiiSaveReader.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/WiiSaveReader.hpp"
 #include "Athena/WiiSave.hpp"
 #include "Athena/WiiFile.hpp"
@@ -342,4 +326,3 @@ WiiFile* WiiSaveReader::buildTree(std::vector<WiiFile*> files)
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/WiiSaveWriter.cpp b/src/Athena/WiiSaveWriter.cpp
index d19a7a4..bc65fd7 100644
--- a/src/Athena/WiiSaveWriter.cpp
+++ b/src/Athena/WiiSaveWriter.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_SAVES
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/WiiSaveWriter.hpp"
 #include "Athena/WiiSave.hpp"
 #include "Athena/WiiFile.hpp"
@@ -265,4 +249,3 @@ void WiiSaveWriter::writeCerts(atUint32 filesSize, atUint32 ngId, atUint8* ngPri
 
 } // io
 } // zelda
-#endif // ATHENA_NO_SAVES
diff --git a/src/Athena/ZQuestFile.cpp b/src/Athena/ZQuestFile.cpp
index 78f52cf..67b2311 100644
--- a/src/Athena/ZQuestFile.cpp
+++ b/src/Athena/ZQuestFile.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_ZQUEST
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ZQuestFile.hpp"
 
 #include <string.h>
@@ -134,5 +118,3 @@ const std::vector<std::string> ZQuestFile::gameStringList()
     return GameStrings;
 }
 }
-
-#endif // ATHENA_NO_ZQUEST
diff --git a/src/Athena/ZQuestFileReader.cpp b/src/Athena/ZQuestFileReader.cpp
index 7566d8f..a8442c4 100644
--- a/src/Athena/ZQuestFileReader.cpp
+++ b/src/Athena/ZQuestFileReader.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_ZQUEST
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ZQuestFileReader.hpp"
 #include "Athena/ZQuestFile.hpp"
 #include "Athena/Compression.hpp"
@@ -125,5 +109,3 @@ ZQuestFile* ZQuestFileReader::read()
 
 } // io
 } // zelda
-
-#endif
diff --git a/src/Athena/ZQuestFileWriter.cpp b/src/Athena/ZQuestFileWriter.cpp
index d9a0fc3..7c0df19 100644
--- a/src/Athena/ZQuestFileWriter.cpp
+++ b/src/Athena/ZQuestFileWriter.cpp
@@ -1,19 +1,3 @@
-#ifndef ATHENA_NO_ZQUEST
-// This file is part of libAthena.
-//
-// libAthena is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// libAthena is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with libAthena.  If not, see <http://www.gnu.org/licenses/>
-
 #include "Athena/ZQuestFileWriter.hpp"
 #include "Athena/ZQuestFile.hpp"
 #include "Athena/Compression.hpp"
@@ -93,5 +77,3 @@ void ZQuestFileWriter::write(ZQuestFile* quest, bool compress)
 
 } // io
 } // zelda
-
-#endif // ATHENA_NO_ZQUEST