#include "base/CharacterSet.h"
#include "base/RefCount.h"
#include "Debug.h"
-#include "OutOfBoundsException.h"
-#include "SBuf.h"
-#include "SBufDetailedStats.h"
-#include "SBufExceptions.h"
+#include "sbuf/OutOfBoundsException.h"
+#include "sbuf/SBuf.h"
+#include "sbuf/DetailedStats.h"
+#include "sbuf/Exceptions.h"
#include "util.h"
#include <cstring>