Include only what you need.

4 files changed, 4 insertions, 36 deletions

diff --git a/fastos/src/tests/filetest.cpp b/fastos/src/tests/filetest.cpp
index 92fd5558590..ad411364c0c 100644
--- a/fastos/src/tests/filetest.cpp
+++ b/fastos/src/tests/filetest.cpp
@@ -3,6 +3,8 @@
 #include "tests.h"
 #include <vespa/fastos/file.h>
 #include <memory>
+#include <cassert>
+#include <sys/mman.h>
 
 namespace {
 
diff --git a/fastos/src/tests/sockettest.cpp b/fastos/src/tests/sockettest.cpp
index 3a62fdbf6eb..0b6e8c9360d 100644
--- a/fastos/src/tests/sockettest.cpp
+++ b/fastos/src/tests/sockettest.cpp
@@ -3,7 +3,7 @@
 #include "tests.h"
 #include <vespa/fastos/file.h>
 #include <vespa/fastos/serversocket.h>
-
+#include <cassert>
 
 #define MAZE_FILE_OFFSET   1078
 
diff --git a/fastos/src/tests/tests.h b/fastos/src/tests/tests.h
index 94062c04e54..62a873f8a54 100644
--- a/fastos/src/tests/tests.h
+++ b/fastos/src/tests/tests.h
@@ -3,6 +3,7 @@
 #include <vespa/fastos/app.h>
 #include <vespa/fastos/socket.h>
 #include <vespa/fastos/thread.h>
+#include <cstring>
 
 class BaseTest : public FastOS_Application
 {
diff --git a/fastos/src/tests/typetest.cpp b/fastos/src/tests/typetest.cpp
index e0399b56ba5..87e3d76c461 100644
--- a/fastos/src/tests/typetest.cpp
+++ b/fastos/src/tests/typetest.cpp
@@ -9,40 +9,6 @@
 class TypeTest : public BaseTest
 {
 private:
-   void PrintfSpecifiersTest ()
-   {
-      char testBuf[200];
-      const char *correct;
-
-      TestHeader("64-bit printf-specifiers test");
-
-      sprintf(testBuf, "%" PRId64, int64_t(-1000)*1000*1000*1000*1000);
-      correct = "-1000000000000000";
-      Progress(strcmp(testBuf, correct) == 0,
-               "Generated=[%s], Correct=[%s]", testBuf, correct);
-
-      sprintf(testBuf, "%" PRIu64, uint64_t(1000)*1000*1000*1000*1000);
-      correct = "1000000000000000";
-      Progress(strcmp(testBuf, correct) == 0,
-               "Generated=[%s], Correct=[%s]", testBuf, correct);
-
-      sprintf(testBuf, "%" PRIo64, uint64_t(1000)*1000*1000*1000*1000);
-      correct = "34327724461500000";
-      Progress(strcmp(testBuf, correct) == 0,
-               "Generated=[%s], Correct=[%s]", testBuf, correct);
-
-      sprintf(testBuf, "%" PRIx64, uint64_t(1000)*1000*1000*1000*1000);
-      correct = "38d7ea4c68000";
-      Progress(strcmp(testBuf, correct) == 0,
-               "Generated=[%s], Correct=[%s]", testBuf, correct);
-
-      sprintf(testBuf, "%" PRIX64, uint64_t(1000)*1000*1000*1000*1000);
-      correct = "38D7EA4C68000";
-      Progress(strcmp(testBuf, correct) == 0,
-               "Generated=[%s], Correct=[%s]", testBuf, correct);
-
-      PrintSeparator();
-   }
 
    void ObjectSizeTest ()
    {
@@ -73,7 +39,6 @@ public:
    {
       printf("grep for the string '%s' to detect failures.\n\n", failString);
 
-      PrintfSpecifiersTest();
       ObjectSizeTest();
 
       PrintSeparator();