refactor: move source files to src

cppalliance · Jul 11, 2023 · 04f75dd · 04f75dd
1 parent e14fe08
commit 04f75dd
Show file tree

Hide file tree

Showing 123 changed files with 187 additions and 1,039 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -115,9 +115,9 @@ find_package(fmt REQUIRED CONFIG)
 
 file(
     GLOB_RECURSE LIB_SOURCES  CONFIGURE_DEPENDS
-        lib/*.cpp
-        lib/*.hpp
-        lib/*.natvis
+        src/lib/*.cpp
+        src/lib/*.hpp
+        src/lib/*.natvis
         include/*.hpp
         include/*.natvis
         SourceFileNames.cpp)
@@ -128,7 +128,7 @@ target_include_directories(mrdox-core
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
     PRIVATE
-    "${PROJECT_SOURCE_DIR}/lib"
+    "${PROJECT_SOURCE_DIR}/src"
     "${PROJECT_SOURCE_DIR}/include")
 target_compile_definitions(
     mrdox-core
@@ -202,7 +202,7 @@ endif ()
 #
 #-------------------------------------------------
 
-file(GLOB_RECURSE TOOL_SOURCES  CONFIGURE_DEPENDS tool/*.cpp tool/*.hpp)
+file(GLOB_RECURSE TOOL_SOURCES  CONFIGURE_DEPENDS src/tool/*.cpp src/tool/*.hpp)
 add_executable(mrdox ${TOOL_SOURCES})
 target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL)
 
@@ -212,8 +212,7 @@ target_include_directories(mrdox
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
     PRIVATE
     "${PROJECT_SOURCE_DIR}/include"
-    "${PROJECT_SOURCE_DIR}/lib"
-    "${PROJECT_SOURCE_DIR}/tool"
+    "${PROJECT_SOURCE_DIR}/src"
 )
 
 target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL)
@@ -242,21 +241,19 @@ if (MRDOX_BUILD_TESTS)
     # Unit tests
     #-------------------------------------------------
     include(CTest)
-    file(GLOB_RECURSE TEST_SUITE_FILES CONFIGURE_DEPENDS test/test_suite/*.cpp test/test_suite/*.hpp)
-    file(GLOB_RECURSE UNIT_TEST_SOURCES CONFIGURE_DEPENDS test/unit/*.cpp test/unit/*.hpp)
+    file(GLOB_RECURSE TEST_SUITE_FILES CONFIGURE_DEPENDS src/test/test_suite/*.cpp src/test/test_suite/*.hpp)
+    file(GLOB_RECURSE UNIT_TEST_SOURCES CONFIGURE_DEPENDS src/test/unit/*.cpp src/test/unit/*.hpp)
     add_executable(mrdox-test ${TEST_SUITE_FILES} ${UNIT_TEST_SOURCES})
     target_include_directories(mrdox-test
             PRIVATE
             "${PROJECT_SOURCE_DIR}/include"
-            "${PROJECT_SOURCE_DIR}/lib"
-            "${PROJECT_SOURCE_DIR}/tool"
-            "${PROJECT_SOURCE_DIR}/test/test_suite"
+            "${PROJECT_SOURCE_DIR}/src"
             )
     target_link_libraries(mrdox-test PUBLIC mrdox-core)
     if (MRDOX_CLANG)
         target_compile_options(mrdox-test PRIVATE -Wno-covered-switch-default)
     endif ()
-    target_compile_definitions(mrdox-test PRIVATE -DMRDOX_UNIT_TEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test/unit")
+    target_compile_definitions(mrdox-test PRIVATE -DMRDOX_TEST_FILES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test-files")
     add_custom_command(
             # if we run tests, we need the addons in the right place.
             TARGET mrdox-test

diff --git a/lib/-XML/CXXTags.cpp → src/lib/-XML/CXXTags.cpp b/lib/-XML/CXXTags.cpp → src/lib/-XML/CXXTags.cpp
diff --git a/lib/-XML/CXXTags.hpp → src/lib/-XML/CXXTags.hpp b/lib/-XML/CXXTags.hpp → src/lib/-XML/CXXTags.hpp
@@ -10,8 +10,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_XML_CXXTAGS_HPP
-#define MRDOX_TOOL_XML_CXXTAGS_HPP
+#ifndef MRDOX_LIB_XML_CXXTAGS_HPP
+#define MRDOX_LIB_XML_CXXTAGS_HPP
 
 #include "XMLTags.hpp"
 #include <mrdox/Metadata/Function.hpp>

diff --git a/lib/-XML/XMLGenerator.cpp → src/lib/-XML/XMLGenerator.cpp b/lib/-XML/XMLGenerator.cpp → src/lib/-XML/XMLGenerator.cpp
@@ -11,8 +11,8 @@
 
 #include "XMLGenerator.hpp"
 #include "XMLWriter.hpp"
-#include "Support/Radix.hpp"
-#include "Support/RawOstream.hpp"
+#include "lib/Support/Radix.hpp"
+#include "lib/Support/RawOstream.hpp"
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Metadata.hpp>
 

diff --git a/lib/-XML/XMLGenerator.hpp → src/lib/-XML/XMLGenerator.hpp b/lib/-XML/XMLGenerator.hpp → src/lib/-XML/XMLGenerator.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_XML_XMLGENERATOR_HPP
-#define MRDOX_TOOL_XML_XMLGENERATOR_HPP
+#ifndef MRDOX_LIB_XML_XMLGENERATOR_HPP
+#define MRDOX_LIB_XML_XMLGENERATOR_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/Generator.hpp>

diff --git a/lib/-XML/XMLTags.cpp → src/lib/-XML/XMLTags.cpp b/lib/-XML/XMLTags.cpp → src/lib/-XML/XMLTags.cpp
@@ -10,7 +10,7 @@
 //
 
 #include "XMLTags.hpp"
-#include "Support/Radix.hpp"
+#include "lib/Support/Radix.hpp"
 #include <mrdox/Platform.hpp>
 
 namespace clang {

diff --git a/lib/-XML/XMLTags.hpp → src/lib/-XML/XMLTags.hpp b/lib/-XML/XMLTags.hpp → src/lib/-XML/XMLTags.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_XML_XMLTAGS_HPP
-#define MRDOX_TOOL_XML_XMLTAGS_HPP
+#ifndef MRDOX_LIB_XML_XMLTAGS_HPP
+#define MRDOX_LIB_XML_XMLTAGS_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/Metadata/Javadoc.hpp>

diff --git a/lib/-XML/XMLWriter.cpp → src/lib/-XML/XMLWriter.cpp b/lib/-XML/XMLWriter.cpp → src/lib/-XML/XMLWriter.cpp
@@ -12,10 +12,10 @@
 
 #include "CXXTags.hpp"
 #include "XMLWriter.hpp"
-#include "Lib/ConfigImpl.hpp"
-#include "Support/Yaml.hpp"
-#include "Support/Radix.hpp"
-#include "Support/SafeNames.hpp"
+#include "lib/Lib/ConfigImpl.hpp"
+#include "lib/Support/Yaml.hpp"
+#include "lib/Support/Radix.hpp"
+#include "lib/Support/SafeNames.hpp"
 #include <mrdox/Platform.hpp>
 #include <llvm/Support/YAMLParser.h>
 #include <llvm/Support/YAMLTraits.h>

diff --git a/lib/-XML/XMLWriter.hpp → src/lib/-XML/XMLWriter.hpp b/lib/-XML/XMLWriter.hpp → src/lib/-XML/XMLWriter.hpp
@@ -9,11 +9,11 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_XML_XMLWRITER_HPP
-#define MRDOX_TOOL_XML_XMLWRITER_HPP
+#ifndef MRDOX_LIB_XML_XMLWRITER_HPP
+#define MRDOX_LIB_XML_XMLWRITER_HPP
 
 #include "XMLTags.hpp"
-#include "Support/YamlFwd.hpp"
+#include "lib/Support/YamlFwd.hpp"
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Support/Error.hpp>

diff --git a/lib/-adoc/AdocCorpus.cpp → src/lib/-adoc/AdocCorpus.cpp b/lib/-adoc/AdocCorpus.cpp → src/lib/-adoc/AdocCorpus.cpp
diff --git a/lib/-adoc/AdocCorpus.hpp → src/lib/-adoc/AdocCorpus.hpp b/lib/-adoc/AdocCorpus.hpp → src/lib/-adoc/AdocCorpus.hpp
@@ -8,8 +8,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_ADOC_ADOCCORPUS_HPP
-#define MRDOX_TOOL_ADOC_ADOCCORPUS_HPP
+#ifndef MRDOX_LIB_ADOC_ADOCCORPUS_HPP
+#define MRDOX_LIB_ADOC_ADOCCORPUS_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/Metadata/DomMetadata.hpp>

diff --git a/lib/-adoc/AdocGenerator.cpp → src/lib/-adoc/AdocGenerator.cpp b/lib/-adoc/AdocGenerator.cpp → src/lib/-adoc/AdocGenerator.cpp
@@ -14,7 +14,7 @@
 #include "Builder.hpp"
 #include "MultiPageVisitor.hpp"
 #include "SinglePageVisitor.hpp"
-#include "Support/SafeNames.hpp"
+#include "lib/Support/SafeNames.hpp"
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/Path.hpp>

diff --git a/lib/-adoc/AdocGenerator.hpp → src/lib/-adoc/AdocGenerator.hpp b/lib/-adoc/AdocGenerator.hpp → src/lib/-adoc/AdocGenerator.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_ADOC_ADOCGENERATOR_HPP
-#define MRDOX_TOOL_ADOC_ADOCGENERATOR_HPP
+#ifndef MRDOX_LIB_ADOC_ADOCGENERATOR_HPP
+#define MRDOX_LIB_ADOC_ADOCGENERATOR_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/Generator.hpp>

diff --git a/lib/-adoc/Builder.cpp → src/lib/-adoc/Builder.cpp b/lib/-adoc/Builder.cpp → src/lib/-adoc/Builder.cpp
@@ -9,7 +9,7 @@
 //
 
 #include "Builder.hpp"
-#include "Support/Radix.hpp"
+#include "lib/Support/Radix.hpp"
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <mrdox/Support/Path.hpp>
 #include <llvm/Support/FileSystem.h>

diff --git a/lib/-adoc/Builder.hpp → src/lib/-adoc/Builder.hpp b/lib/-adoc/Builder.hpp → src/lib/-adoc/Builder.hpp
@@ -12,7 +12,7 @@
 #define MRDOX_LIB_ADOC_BUILDER_HPP
 
 #include "Options.hpp"
-#include "Support/Radix.hpp"
+#include "lib/Support/Radix.hpp"
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/JavaScript.hpp>

diff --git a/lib/-adoc/MultiPageVisitor.cpp → src/lib/-adoc/MultiPageVisitor.cpp b/lib/-adoc/MultiPageVisitor.cpp → src/lib/-adoc/MultiPageVisitor.cpp
diff --git a/lib/-adoc/MultiPageVisitor.hpp → src/lib/-adoc/MultiPageVisitor.hpp b/lib/-adoc/MultiPageVisitor.hpp → src/lib/-adoc/MultiPageVisitor.hpp
diff --git a/lib/-adoc/Options.cpp → src/lib/-adoc/Options.cpp b/lib/-adoc/Options.cpp → src/lib/-adoc/Options.cpp
@@ -10,8 +10,8 @@
 //
 
 #include "Options.hpp"
-#include "Support/Yaml.hpp"
-#include "Lib/ConfigImpl.hpp" // VFALCO This is a problem
+#include "lib/Support/Yaml.hpp"
+#include "lib/Lib/ConfigImpl.hpp" // VFALCO This is a problem
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Support/Path.hpp>
 #include <llvm/Support/YAMLParser.h>

diff --git a/lib/-adoc/Options.hpp → src/lib/-adoc/Options.hpp b/lib/-adoc/Options.hpp → src/lib/-adoc/Options.hpp
@@ -8,8 +8,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_ADOC_OPTIONS_HPP
-#define MRDOX_TOOL_ADOC_OPTIONS_HPP
+#ifndef MRDOX_LIB_ADOC_OPTIONS_HPP
+#define MRDOX_LIB_ADOC_OPTIONS_HPP
 
 #include <mrdox/Support/Error.hpp>
 #include <string>

diff --git a/lib/-adoc/SinglePageVisitor.cpp → src/lib/-adoc/SinglePageVisitor.cpp b/lib/-adoc/SinglePageVisitor.cpp → src/lib/-adoc/SinglePageVisitor.cpp
diff --git a/lib/-adoc/SinglePageVisitor.hpp → src/lib/-adoc/SinglePageVisitor.hpp b/lib/-adoc/SinglePageVisitor.hpp → src/lib/-adoc/SinglePageVisitor.hpp
diff --git a/lib/-bitcode/BitcodeGenerator.cpp → src/lib/-bitcode/BitcodeGenerator.cpp b/lib/-bitcode/BitcodeGenerator.cpp → src/lib/-bitcode/BitcodeGenerator.cpp
@@ -10,9 +10,9 @@
 //
 
 #include "BitcodeGenerator.hpp"
-#include "Support/Error.hpp"
-#include "Support/SafeNames.hpp"
-#include "AST/Bitcode.hpp"
+#include "lib/Support/Error.hpp"
+#include "lib/Support/SafeNames.hpp"
+#include "lib/AST/Bitcode.hpp"
 #include <mrdox/Support/ThreadPool.hpp>
 #include <mrdox/Metadata.hpp>
 

diff --git a/lib/-bitcode/BitcodeGenerator.hpp → src/lib/-bitcode/BitcodeGenerator.hpp b/lib/-bitcode/BitcodeGenerator.hpp → src/lib/-bitcode/BitcodeGenerator.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_BITCODE_BITCODEGENERATOR_HPP
-#define MRDOX_TOOL_BITCODE_BITCODEGENERATOR_HPP
+#ifndef MRDOX_LIB_BITCODE_BITCODEGENERATOR_HPP
+#define MRDOX_LIB_BITCODE_BITCODEGENERATOR_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/Generator.hpp>

diff --git a/lib/AST/ASTVisitor.cpp → src/lib/AST/ASTVisitor.cpp b/lib/AST/ASTVisitor.cpp → src/lib/AST/ASTVisitor.cpp
@@ -14,9 +14,9 @@
 #include "ASTVisitorHelpers.hpp"
 #include "Bitcode.hpp"
 #include "ParseJavadoc.hpp"
-#include "Support/Path.hpp"
-#include "Support/Debug.hpp"
-#include "Lib/Diagnostics.hpp"
+#include "lib/Support/Path.hpp"
+#include "lib/Support/Debug.hpp"
+#include "lib/Lib/Diagnostics.hpp"
 #include <mrdox/Metadata.hpp>
 #include <clang/AST/AST.h>
 #include <clang/AST/Attr.h>

diff --git a/lib/AST/ASTVisitor.hpp → src/lib/AST/ASTVisitor.hpp b/lib/AST/ASTVisitor.hpp → src/lib/AST/ASTVisitor.hpp
@@ -10,11 +10,11 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_ASTVISITOR_HPP
-#define MRDOX_TOOL_AST_ASTVISITOR_HPP
+#ifndef MRDOX_LIB_AST_ASTVISITOR_HPP
+#define MRDOX_LIB_AST_ASTVISITOR_HPP
 
-#include "Lib/ConfigImpl.hpp"
-#include "Lib/ExecutionContext.hpp"
+#include "lib/Lib/ConfigImpl.hpp"
+#include "lib/Lib/ExecutionContext.hpp"
 #include <mrdox/Platform.hpp>
 #include <clang/Tooling/Execution.h>
 #include <clang/Tooling/Tooling.h>

diff --git a/lib/AST/ASTVisitorHelpers.hpp → src/lib/AST/ASTVisitorHelpers.hpp b/lib/AST/ASTVisitorHelpers.hpp → src/lib/AST/ASTVisitorHelpers.hpp
@@ -7,8 +7,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_ASTVISITORHELPERS_HPP
-#define MRDOX_TOOL_AST_ASTVISITORHELPERS_HPP
+#ifndef MRDOX_LIB_AST_ASTVISITORHELPERS_HPP
+#define MRDOX_LIB_AST_ASTVISITORHELPERS_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/Metadata.hpp>

diff --git a/lib/AST/AnyBlock.hpp → src/lib/AST/AnyBlock.hpp b/lib/AST/AnyBlock.hpp → src/lib/AST/AnyBlock.hpp
@@ -10,13 +10,13 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_ANYBLOCK_HPP
-#define MRDOX_TOOL_AST_ANYBLOCK_HPP
+#ifndef MRDOX_LIB_AST_ANYBLOCK_HPP
+#define MRDOX_LIB_AST_ANYBLOCK_HPP
 
 #include "BitcodeReader.hpp"
 #include "DecodeRecord.hpp"
-#include "Support/Debug.hpp"
-#include "Support/Error.hpp"
+#include "lib/Support/Debug.hpp"
+#include "lib/Support/Error.hpp"
 
 namespace clang {
 namespace mrdox {

diff --git a/lib/AST/Bitcode.cpp → src/lib/AST/Bitcode.cpp b/lib/AST/Bitcode.cpp → src/lib/AST/Bitcode.cpp
diff --git a/lib/AST/Bitcode.hpp → src/lib/AST/Bitcode.hpp b/lib/AST/Bitcode.hpp → src/lib/AST/Bitcode.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_BITCODE_HPP
-#define MRDOX_TOOL_AST_BITCODE_HPP
+#ifndef MRDOX_LIB_AST_BITCODE_HPP
+#define MRDOX_LIB_AST_BITCODE_HPP
 
 #include <mrdox/Platform.hpp>
 #include <mrdox/MetadataFwd.hpp>

diff --git a/lib/AST/BitcodeIDs.hpp → src/lib/AST/BitcodeIDs.hpp b/lib/AST/BitcodeIDs.hpp → src/lib/AST/BitcodeIDs.hpp
@@ -10,8 +10,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_BITCODEIDS_HPP
-#define MRDOX_TOOL_AST_BITCODEIDS_HPP
+#ifndef MRDOX_LIB_AST_BITCODEIDS_HPP
+#define MRDOX_LIB_AST_BITCODEIDS_HPP
 
 #include <mrdox/Platform.hpp>
 #include <llvm/Bitstream/BitCodeEnums.h>

diff --git a/lib/AST/BitcodeReader.cpp → src/lib/AST/BitcodeReader.cpp b/lib/AST/BitcodeReader.cpp → src/lib/AST/BitcodeReader.cpp
@@ -12,8 +12,8 @@
 #include "BitcodeReader.hpp"
 #include "AnyBlock.hpp"
 #include "DecodeRecord.hpp"
-#include "Support/Debug.hpp"
-#include "Support/Error.hpp"
+#include "lib/Support/Debug.hpp"
+#include "lib/Support/Error.hpp"
 #include <mrdox/Support/Error.hpp>
 
 namespace clang {

diff --git a/lib/AST/BitcodeReader.hpp → src/lib/AST/BitcodeReader.hpp b/lib/AST/BitcodeReader.hpp → src/lib/AST/BitcodeReader.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_BITCODEREADER_HPP
-#define MRDOX_TOOL_AST_BITCODEREADER_HPP
+#ifndef MRDOX_LIB_AST_BITCODEREADER_HPP
+#define MRDOX_LIB_AST_BITCODEREADER_HPP
 
 //
 // This file implements a reader for parsing the

diff --git a/lib/AST/BitcodeWriter.cpp → src/lib/AST/BitcodeWriter.cpp b/lib/AST/BitcodeWriter.cpp → src/lib/AST/BitcodeWriter.cpp
@@ -13,7 +13,7 @@
 #include "BitcodeWriter.hpp"
 #include "Bitcode.hpp"
 #include "ParseJavadoc.hpp"
-#include "Support/Debug.hpp"
+#include "lib/Support/Debug.hpp"
 #include <mrdox/Metadata.hpp>
 #include <llvm/ADT/IndexedMap.h>
 #include <initializer_list>

diff --git a/lib/AST/BitcodeWriter.hpp → src/lib/AST/BitcodeWriter.hpp b/lib/AST/BitcodeWriter.hpp → src/lib/AST/BitcodeWriter.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_BITCODEWRITER_HPP
-#define MRDOX_TOOL_AST_BITCODEWRITER_HPP
+#ifndef MRDOX_LIB_AST_BITCODEWRITER_HPP
+#define MRDOX_LIB_AST_BITCODEWRITER_HPP
 
 //
 // This file implements a writer for serializing the

diff --git a/lib/AST/DecodeRecord.hpp → src/lib/AST/DecodeRecord.hpp b/lib/AST/DecodeRecord.hpp → src/lib/AST/DecodeRecord.hpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_DECODERECORD_HPP
-#define MRDOX_TOOL_AST_DECODERECORD_HPP
+#ifndef MRDOX_LIB_AST_DECODERECORD_HPP
+#define MRDOX_LIB_AST_DECODERECORD_HPP
 
 #include "BitcodeReader.hpp"
 

diff --git a/lib/AST/ParseJavadoc.cpp → src/lib/AST/ParseJavadoc.cpp b/lib/AST/ParseJavadoc.cpp → src/lib/AST/ParseJavadoc.cpp
diff --git a/lib/AST/ParseJavadoc.hpp → src/lib/AST/ParseJavadoc.hpp b/lib/AST/ParseJavadoc.hpp → src/lib/AST/ParseJavadoc.hpp
@@ -9,10 +9,10 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#ifndef MRDOX_TOOL_AST_PARSEJAVADOC_HPP
-#define MRDOX_TOOL_AST_PARSEJAVADOC_HPP
+#ifndef MRDOX_LIB_AST_PARSEJAVADOC_HPP
+#define MRDOX_LIB_AST_PARSEJAVADOC_HPP
 
-#include "Lib/Diagnostics.hpp"
+#include "lib/Lib/Diagnostics.hpp"
 #include <mrdox/Platform.hpp>
 #include <mrdox/Config.hpp>
 #include <mrdox/Metadata/Javadoc.hpp>