diff --git a/CheckClass.cpp b/CheckClass.cpp
index 2a9d8d2e6..6b1e5be76 100644
--- a/CheckClass.cpp
+++ b/CheckClass.cpp
@@ -6,6 +6,11 @@
 #include <list>
 #include <string>
 #include <sstream>
+
+
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
 //---------------------------------------------------------------------------
 
 extern bool CheckCodingStyle;
diff --git a/CheckHeaders.cpp b/CheckHeaders.cpp
index c407880b3..8ad03ce1e 100644
--- a/CheckHeaders.cpp
+++ b/CheckHeaders.cpp
@@ -2,6 +2,7 @@
 #include "CheckHeaders.h"
 #include "tokenize.h"
 #include "CommonCheck.h"
+#include <algorithm>
 #include <list>
 #include <sstream>
 #include <string>
diff --git a/main.cpp b/main.cpp
index 6b5abf0ed..e16ed5580 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,6 +11,10 @@
 #include <iostream>
 #include <sstream>
 
+#ifdef __BORLANDC__
+#include <dir.h>
+#endif
+
 //---------------------------------------------------------------------------
 bool Debug = false;
 bool ShowAll = false;
@@ -41,6 +45,21 @@ int main(int argc, char* argv[])
         else if (strcmp(argv[i],"--style")==0)
             CheckCodingStyle = true;
 
+        // Filenames
+        else if ( strchr(argv[i], '*') )
+        {
+            #ifndef __GNUC__
+            struct ffblk f;
+            int done = findfirst(argv[i], &f, 0);
+            while ( ! done )
+            {
+                filenames.push_back( f.ff_name );
+                done = findnext(&f);
+            }
+            findclose(&f);
+            #endif
+        }
+
         else
             filenames.push_back( argv[i] );
     }
diff --git a/tokenize.cpp b/tokenize.cpp
index 40eee932e..afa7dd260 100644
--- a/tokenize.cpp
+++ b/tokenize.cpp
@@ -12,6 +12,10 @@
 #include <stdlib.h>     // <- strtoul
 #include <stdio.h>
 
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
+
 //---------------------------------------------------------------------------
 
 // Helper functions..