diff --git a/test/testpaint/intercept.h b/test/testpaint/intercept.h
index 7971e733c2..3d008443e7 100644
--- a/test/testpaint/intercept.h
+++ b/test/testpaint/intercept.h
@@ -28,5 +28,8 @@ int getTrackSequenceCount(uint8 rideType, uint8 trackType);
 bool rideIsImplemented(int rideType);
 bool rideSupportsTrackType(int rideType, int trackType);
 bool testTrackPainting(int rideType, int trackType);
+bool testSupportSegments(uint8 rideType, uint8 trackType);
+bool testTunnels(uint8 rideType, uint8 trackType);
+bool testVerticalTunnels(uint8 rideType, uint8 trackType);
 
 #endif // #endif _TEST_PAINT_INTERCEPT_H_
diff --git a/test/testpaint/intercept_2.cpp b/test/testpaint/intercept_2.cpp
index 72727d5b10..5a7fd268e3 100644
--- a/test/testpaint/intercept_2.cpp
+++ b/test/testpaint/intercept_2.cpp
@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <vector>
+#include <algorithm>
 
 extern "C" {
     #include "intercept.h"
@@ -58,7 +59,7 @@ namespace Intercept2
         uint8 type;
     };
 
-    bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs)
+    static bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs)
     {
         if (lhs.height != rhs.height) {
             return lhs.height < rhs.height;
@@ -635,7 +636,7 @@ namespace Intercept2
         }
 
         if (height < 0) {
-            sprintf(out, "height - %d", abs(height));
+            sprintf(out, "height - %d", int(abs(height)));
             return;
         }
     }