Reorganize headers and explicitly link against launchpadlib

cpp/CMakeLists.txt

@@ -33,7 +33,7 @@ target_link_libraries(build-packages PRIVATE lubuntuci PkgConfig::LIBGIT2 update
 
 add_executable(fetch-indexes fetch-indexes.cpp utilities.cpp)
 target_include_directories(fetch-indexes PRIVATE /srv/lubuntu-ci/repos/ci-tools/include/launchpadlib-cpp)
-target_link_libraries(fetch-indexes PRIVATE lubuntuci CURL::libcurl yaml-cpp::yaml-cpp ZLIB::ZLIB)
+target_link_libraries(fetch-indexes PRIVATE lubuntuci CURL::libcurl yaml-cpp::yaml-cpp ZLIB::ZLIB /srv/lubuntu-ci/repos/ci-tools/lib/liblaunchpad.so)
 
 set_target_properties(lubuntuci build-packages fetch-indexes update-maintainer PROPERTIES
     BUILD_WITH_INSTALL_RPATH TRUE

cpp/fetch-indexes.cpp

@@ -16,13 +16,13 @@
 #include "utilities.h"
 
 #include "launchpad.h"
-#include "archive.h"
-#include "distro_series.h"
-#include "build.h"
-#include "distribution.h"
 #include "person.h"
+#include "distribution.h"
+#include "distro_series.h"
 #include "source_package_publishing_history.h"
+#include "build.h"
 #include "binary_package_publishing_history.h"
+#include "archive.h"
 
 #include <iostream>
 #include <fstream>