Major header refactoring.

doc/samples/benchmark/real.cpp

@@ -17,7 +17,7 @@
 #include <cstdio>
 
 #include <lol/engine.h>
-#include <lol/types/real.h>
+#include <lol/real>
 
 using namespace lol;
 

doc/samples/btphystest.cpp

@@ -16,7 +16,7 @@
 #endif
 
 #include <lol/engine.h>
-#include <lol/image/color.h>
+#include <lol/color>
 #include "loldebug.h"
 
 using namespace lol;

doc/samples/math/pi.cpp

@@ -18,7 +18,7 @@
 #include <iomanip>
 
 #include <lol/engine.h>
-#include <lol/types/real.h>
+#include <lol/real>
 
 using lol::real;
 

doc/samples/math/poly.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/math/polynomial.h>
+#include <lol/math>
 
 using namespace lol;
 

doc/samples/sandbox/sample.cpp

@@ -14,8 +14,9 @@
 #   include "config.h"
 #endif
 
-#include <lol/engine.h>
-#include <lol/types/bigint.h>
+#include <lol/engine.h> // FIXME: for now this is required for SDL_main
+#include <lol/thread>
+#include <lol/bigint>
 
 using namespace lol;
 

doc/samples/simplex.cpp

@@ -16,7 +16,7 @@
 #endif
 
 #include <lol/engine.h>
-#include <lol/math/noise.h>
+#include <lol/noise>
 
 using namespace lol;
 

doc/tutorial/02_cube.cpp

@@ -15,7 +15,7 @@
 #endif
 
 #include <lol/engine.h>
-#include <lol/image/color.h>
+#include <lol/color>
 #include "loldebug.h"
 
 using namespace lol;

doc/tutorial/11_fractal.cpp

@@ -18,10 +18,10 @@
 #include <sstream>
 
 #include <lol/engine.h>
-#include <lol/types/real.h>
-#include <lol/math/vector.h>
-#include <lol/math/transform.h>
-#include <lol/image/color.h>
+#include <lol/real>
+#include <lol/vector>
+#include <lol/transform>
+#include <lol/color>
 
 #include "loldebug.h"
 

doc/tutorial/16_movie.cpp

@@ -1,7 +1,7 @@
 //
 //  Lol Engine — GIF encoding sample
 //
-//  Copyright © 2016—2019 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2016—2020 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -15,8 +15,9 @@
 #endif
 
 #include <lol/engine.h>
+#include <lol/vector>
+#include <lol/noise>
 #include <lol/image/movie.h>
-#include <lol/math/noise.h>
 
 int main(int argc, char **argv)
 {

lol-core

@@ -1 +1 @@
-Subproject commit 342c9ea0fd04e69c086d090b7bede0413eb086f5
+Subproject commit b85c7adfe6d9fe0779548736bf5140569e48e919

src/application/android-app.h

@@ -1,11 +1,13 @@
 //
-// Lol Engine
+//  Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the Do What The Fuck You Want To
-//   Public License, Version 2, as published by Sam Hocevar. See
-//   http://www.wtfpl.net/ for more details.
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
 //
 
 #pragma once
@@ -15,7 +17,7 @@
 // --------------------
 //
 
-#include <lol/math/vector.h>
+#include <lol/vector>
 
 namespace lol
 {

src/application/egl-app.h

@@ -1,11 +1,13 @@
 //
-// Lol Engine
+//  Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the Do What The Fuck You Want To
-//   Public License, Version 2, as published by Sam Hocevar. See
-//   http://www.wtfpl.net/ for more details.
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
 //
 
 #pragma once
@@ -15,7 +17,7 @@
 // ----------------
 //
 
-#include <lol/math/vector.h>
+#include <lol/vector>
 
 namespace lol
 {

src/application/sdl-app.h

@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2019 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -17,7 +17,7 @@
 // ----------------
 //
 
-#include <lol/math/vector.h>
+#include <lol/vector>
 
 #if LOL_USE_SDL
 #   if HAVE_SDL2_SDL_H

src/base/log.cpp

@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2019 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -80,7 +80,7 @@ void msg::helper(message_type type, char const *fmt, va_list ap)
 #if !defined LOL_BUILD_DEBUG && !_DEBUG
     if (type == message_type::debug)
     {
-        static bool const disable_debug = os::getenv("LOL_DEBUG").size() > 0;
+        static bool const disable_debug = sys::getenv("LOL_DEBUG").size() > 0;
         if (disable_debug)
             return;
     }

src/camera.h

@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2018 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -17,7 +17,7 @@
 // ----------------
 //
 
-#include <lol/math/transform.h>
+#include <lol/transform>
 
 #include "engine/worldentity.h"
 

src/debug/lines.cpp

@@ -11,7 +11,7 @@
 //
 
 #include <lol/engine-internal.h>
-#include <lol/image/color.h>
+#include <lol/color>
 
 namespace lol
 {

src/engine/worldentity.h

@@ -17,7 +17,7 @@
 // -----------------------
 //
 
-#include <lol/math/transform.h>
+#include <lol/transform>
 #include <../legacy/lol/math/geometry.h> // box3
 
 #include "engine/entity.h"

src/gpu/shader.cpp

@@ -11,6 +11,7 @@
 //
 
 #include <lol/engine-internal.h>
+#include <lol/pegtl>
 
 #include <string>
 #include <memory>
@@ -25,8 +26,6 @@
 #   undef WIN32_LEAN_AND_MEAN
 #endif
 
-#include <lol/base/pegtl.h>
-
 #include "lolgl.h"
 
 // FIXME: fine-tune this define

src/image/codec/imlib2-image.cpp

@@ -83,7 +83,7 @@ ResourceCodecData *Imlib2ImageCodec::Load(std::string const &path)
 
     for (int i = 0; i < size.x * size.y; i++)
     {
-        if (os::is_big_endian())
+        if (sys::is_big_endian())
             dstdata[i] = srcdata[i].argb;
         else
             dstdata[i] = srcdata[i].bgra;
@@ -113,7 +113,7 @@ bool Imlib2ImageCodec::Save(std::string const &path, ResourceCodecData *data)
 
     for (int i = 0; i < size.x * size.y; i++)
     {
-        if (os::is_big_endian())
+        if (sys::is_big_endian())
             dstdata[i] = srcdata[i].argb;
         else
             dstdata[i] = srcdata[i].bgra;

src/image/filter/yuv.cpp

@@ -11,7 +11,7 @@
 //
 
 #include <lol/engine-internal.h>
-#include <lol/image/color.h>
+#include <lol/color>
 
 /*
  * YUV conversion functions

src/lol/base/all.h

@@ -12,11 +12,12 @@
 
 #pragma once
 
+#include <lol/utils>
+
 #include <../legacy/lol/base/types.h>
 #include <lol/base/log.h>
 #include <../legacy/lol/base/assert.h>
 #include <lol/base/array.h>
 #include <../legacy/lol/base/avl_tree.h>
-#include <lol/base/utils.h>
 #include <lol/base/enum.h>
 

src/lol/base/enum.h

@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2018 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
 //            © 2013—2015 Guillaume Bittoun <guillaume.bittoun@gmail.com>
 //
 //  Lol Engine is free software. It comes without any warranty, to
@@ -13,10 +13,9 @@
 
 #pragma once
 
-#include <lol/base/utils.h> // has_key()
-
-#include <string>
-#include <map>
+#include <lol/utils> // has_key()
+#include <string>    // std::string
+#include <map>       // std::map
 
 namespace lol
 {

src/lol/base/log.h

@@ -18,9 +18,8 @@
 // The central logging system.
 //
 
-#include <lol/base/private/features.h>
-
-#include <cstdarg> // va_list
+#include <lol/utils> // lol_attr_printf_format
+#include <cstdarg>   // va_list
 
 namespace lol
 {

src/lol/debug/lines.h

@@ -1,11 +1,13 @@
 //
-// Lol Engine
+//  Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the Do What The Fuck You Want To
-//   Public License, Version 2, as published by Sam Hocevar. See
-//   http://www.wtfpl.net/ for more details.
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
 //
 
 #pragma once
@@ -16,7 +18,7 @@
 //
 
 #include <../legacy/lol/math/geometry.h> // box3
-#include <lol/math/vector.h> // vec3, vec4 etc.
+#include <lol/vector> // vec3, vec4 etc.
 
 #include <stdint.h>
 

src/lol/gpu/vertexbuffer.h

@@ -17,7 +17,7 @@
 // ----------------------------------------------
 //
 
-#include <lol/types/half.h>
+#include <lol/half>
 
 #include <cstring>
 #include <map>

src/lol/image/image.h

@@ -18,7 +18,7 @@
 //
 
 #include <../legacy/lol/math/arraynd.h>
-#include <lol/math/vector.h>
+#include <lol/vector>
 #include <../legacy/lol/image/pixel.h>
 #include <../legacy/lol/math/geometry.h> // ibox2
 

src/lol/image/resource.h

@@ -18,7 +18,7 @@
 // ——————————————————
 //
 
-#include <lol/math/vector.h>
+#include <lol/vector>
 #include <../legacy/lol/math/geometry.h>
 #include <lol/image/image.h>
 #include <../legacy/lol/image/pixel.h>

src/numeric.h

@@ -1,11 +1,13 @@
 //
-// Lol Engine
+//  Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the Do What The Fuck You Want To
-//   Public License, Version 2, as published by Sam Hocevar. See
-//   http://www.wtfpl.net/ for more details.
+//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
 //
 
 #pragma once
@@ -15,8 +17,7 @@
 // ------------------
 //
 
-#include <../legacy/lol/math/functions.h>
-
+#include <lol/math>
 #include <cstdlib>
 #include <stdint.h>
 

src/scene.h

@@ -24,7 +24,7 @@
 
 #include <lol/gpu/renderer.h>
 #include <lol/gpu/framebuffer.h>
-#include <lol/base/thread.h>
+#include <lol/thread>
 
 #include <vector>   // std::vector
 #include <memory>   // std::shared_ptr

src/t/base/array.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <lol/base/array.h>
 
 namespace lol

src/t/base/avl_tree.cpp

@@ -15,7 +15,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <../legacy/lol/base/avl_tree.h>
 
 namespace lol

src/t/base/enum.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <lol/base/enum.h>
 
 #include <string>

src/t/base/map.cpp

@@ -14,9 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/base/utils.h>
-
+#include <lol/unit_test>
+#include <lol/utils>
 #include <map>
 
 namespace lol

src/t/base/string.cpp

@@ -15,8 +15,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/base/utils.h>
+#include <lol/unit_test>
+#include <lol/utils>
 
 #include <string>
 

src/t/base/types.cpp

@@ -14,12 +14,12 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <../legacy/lol/base/types.h>
-#include <../legacy/lol/math/functions.h>
-#include <lol/math/vector.h>
-#include <lol/math/transform.h>
-#include <lol/types/half.h>
+#include <lol/math>
+#include <lol/vector>
+#include <lol/transform>
+#include <lol/half>
 
 namespace lol
 {

src/t/entity/camera.cpp

@@ -15,7 +15,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <lol/../camera.h>
 #include <lol/../engine/ticker.h>
 

src/t/image/color.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/image/color.h>
+#include <lol/unit_test>
+#include <lol/color>
 
 namespace lol
 {

src/t/image/image.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>
+#include <lol/unit_test>
+#include <lol/vector>
 #include <lol/image/image.h>
 
 namespace lol

src/t/math/array2d.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <../legacy/lol/math/arraynd.h>
 
 namespace lol

src/t/math/array3d.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <../legacy/lol/math/arraynd.h>
 
 namespace lol

src/t/math/arraynd.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <../legacy/lol/math/arraynd.h>
 
 namespace lol

src/t/math/bigint.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/types/bigint.h>
+#include <lol/unit_test>
+#include <lol/bigint>
 
 namespace lol
 {

src/t/math/box.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>
+#include <lol/unit_test>
+#include <lol/vector>
 #include <../legacy/lol/math/geometry.h>
 
 namespace lol

src/t/math/cmplx.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/transform.h>
+#include <lol/unit_test>
+#include <lol/transform>
 
 namespace lol
 {

src/t/math/half.cpp

@@ -14,10 +14,10 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/types/half.h>
-#include <lol/math/vector.h>    // for the sizeof(f16vec2) etc. tests
-#include <lol/math/transform.h> // for the sizeof(f16mat2) etc. tests
+#include <lol/unit_test>
+#include <lol/half>
+#include <lol/vector>    // for the sizeof(f16vec2) etc. tests
+#include <lol/transform> // for the sizeof(f16mat2) etc. tests
 
 namespace lol
 {

src/t/math/interp.cpp

@@ -14,7 +14,7 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
+#include <lol/unit_test>
 #include <../legacy/lol/math/interp.h>
 
 namespace lol

src/t/math/matrix.cpp

@@ -14,10 +14,10 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>    // vec_t
-#include <lol/math/transform.h> // mat_t
-#include <lol/math/rand.h>      // lol::rand
+#include <lol/unit_test>
+#include <lol/math>      // lol::rand
+#include <lol/vector>    // vec_t
+#include <lol/transform> // mat_t
 
 #include <cfloat> // FLT_MAX
 

src/t/math/noise/simplex.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/noise.h>
+#include <lol/unit_test>
+#include <lol/noise>
 
 namespace lol
 {

src/t/math/numbers.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <../legacy/lol/math/functions.h>
+#include <lol/unit_test>
+#include <lol/math>
 
 namespace lol
 {

src/t/math/polynomial.cpp

@@ -14,9 +14,9 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/types/real.h>
-#include <lol/math/polynomial.h>
+#include <lol/unit_test>
+#include <lol/real>
+#include <lol/math>
 
 namespace lol
 {

src/t/math/quat.cpp

@@ -14,11 +14,10 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>    // vec_t
-#include <lol/math/transform.h> // quat_t
-#include <lol/math/rand.h>      // rand()
-#include <../legacy/lol/math/functions.h> // radians()
+#include <lol/unit_test>
+#include <lol/vector>    // vec_t
+#include <lol/transform> // quat_t
+#include <lol/math>      // rand(), radians()
 
 #include <cstring> // memset
 #include <tuple>   // std::tuple

src/t/math/rand.cpp

@@ -14,10 +14,10 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/rand.h>
+#include <lol/unit_test>
 
-#include <cfloat> // FLT_MAX
+#include <lol/math> // lol::rand
+#include <cfloat>   // FLT_MAX
 
 namespace lol
 {

src/t/math/real.cpp

@@ -14,10 +14,10 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/types/real.h>
-#include <lol/math/transform.h> // for rcmplx
+#include <lol/unit_test>
 
+#include <lol/real>
+#include <lol/transform> // for rcmplx
 #include <cmath>
 
 namespace lol

src/t/math/rotation.cpp

@@ -14,10 +14,10 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>
-#include <lol/math/transform.h>
-#include <../legacy/lol/math/functions.h>
+#include <lol/unit_test>
+#include <lol/vector>
+#include <lol/transform>
+#include <lol/math>
 
 namespace lol
 {

src/t/math/sqt.cpp

@@ -14,9 +14,9 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>
-#include <lol/math/transform.h>
+#include <lol/unit_test>
+#include <lol/vector>
+#include <lol/transform>
 
 namespace lol
 {

src/t/math/trig.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <../legacy/lol/math/functions.h>
+#include <lol/unit_test>
+#include <lol/math>
 
 namespace lol
 {
@@ -41,25 +41,10 @@ lolunit_declare_fixture(trig_test)
     {
         lolunit_assert_doubles_equal(radians(90), radians(90.0), 1e-5);
 
-        lolunit_assert_doubles_equal(radians((uint8_t)90),  radians(90.0), 1e-5);
         lolunit_assert_doubles_equal(radians((int8_t)90),   radians(90.0), 1e-5);
-        lolunit_assert_doubles_equal(radians((uint16_t)90), radians(90.0), 1e-5);
         lolunit_assert_doubles_equal(radians((int16_t)90),  radians(90.0), 1e-5);
-        lolunit_assert_doubles_equal(radians((uint32_t)90), radians(90.0), 1e-5);
         lolunit_assert_doubles_equal(radians((int32_t)90),  radians(90.0), 1e-5);
-        lolunit_assert_doubles_equal(radians((uint64_t)90), radians(90.0), 1e-5);
         lolunit_assert_doubles_equal(radians((int64_t)90),  radians(90.0), 1e-5);
-
-        lolunit_assert_doubles_equal(degrees(1), degrees(1.0), 1e-5);
-
-        lolunit_assert_doubles_equal(degrees((uint8_t)1),  degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((int8_t)1),   degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((uint16_t)1), degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((int16_t)1),  degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((uint32_t)1), degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((int32_t)1),  degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((uint64_t)1), degrees(1.0), 1e-5);
-        lolunit_assert_doubles_equal(degrees((int64_t)1),  degrees(1.0), 1e-5);
     }
 };
 

src/t/math/vector.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/math/vector.h>
+#include <lol/unit_test>
+#include <lol/vector>
 
 namespace lol
 {

src/t/sys/thread.cpp

@@ -15,8 +15,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/base/thread.h>
+#include <lol/unit_test>
+#include <lol/thread>
 
 namespace lol
 {

src/t/sys/timer.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/base/lolunit.h>
-#include <lol/base/thread.h>
+#include <lol/unit_test>
+#include <lol/thread>
 
 namespace lol
 {

src/t/test-common.cpp

@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include <lol/engine.h> // this is required for SDL_main
-#include <lol/base/lolunit.h>
+#include <lol/engine.h> // FIXME: for now this is required for SDL_main
+#include <lol/unit_test>
 
 #include <cstdio>
 #include <cstdlib>

src/utils.h

@@ -18,8 +18,8 @@
 // -----------------------------------
 //
 
-#include <lol/base/utils.h>
-#include <lol/math/rand.h>
+#include <lol/utils>
+#include <lol/math>  // lol::rand
 
 #include <string>