diff --git a/input/tests/Makefile b/input/tests/Makefile
index 8b7663dd5..8760adfe7 100644
--- a/input/tests/Makefile
+++ b/input/tests/Makefile
@@ -1,4 +1,4 @@
-GCC=g++
+GCC=g++ -Wall
 
 all: sdl_driver_test ois_driver_test evtlist_test
 
diff --git a/rend2d/tests/Makefile b/rend2d/tests/Makefile
index c2e16c756..efbbda5d6 100644
--- a/rend2d/tests/Makefile
+++ b/rend2d/tests/Makefile
@@ -1,4 +1,4 @@
-GCC=g++
+GCC=g++ -Wall
 
 all: sdl_test
 
diff --git a/sound/sources/ffmpeg_source.cpp b/sound/sources/ffmpeg_source.cpp
index bfb428234..2633515d8 100644
--- a/sound/sources/ffmpeg_source.cpp
+++ b/sound/sources/ffmpeg_source.cpp
@@ -97,8 +97,8 @@ size_t FFMpegSource::read(void *data, size_t length)
 
   // First, copy over any stored data we might be sitting on
   {
-    int s = storage.size();
-    int copy = s;
+    size_t s = storage.size();
+    size_t copy = s;
     if(s)
       {
         // Make sure there's room
@@ -111,6 +111,7 @@ size_t FFMpegSource::read(void *data, size_t length)
         left -= copy;
 
         // Is there anything left in the storage?
+        assert(s>= copy);
         s -= copy;
         if(s)
           {
@@ -133,7 +134,7 @@ size_t FFMpegSource::read(void *data, size_t length)
         break;
 
       // We only allow one stream per file at the moment
-      assert(StreamNum == packet.stream_index);
+      assert((int)StreamNum == packet.stream_index);
 
       // Decode the packet
       int len = AVCODEC_MAX_AUDIO_FRAME_SIZE;
@@ -151,7 +152,7 @@ size_t FFMpegSource::read(void *data, size_t length)
       if(len > 0)
         {
           // copy = how many bytes do we copy now
-          int copy = len;
+          size_t copy = len;
           if(copy > left)
             copy = left;
 
diff --git a/sound/sources/ffmpeg_source.hpp b/sound/sources/ffmpeg_source.hpp
index f0b5342ac..5bb478d74 100644
--- a/sound/sources/ffmpeg_source.hpp
+++ b/sound/sources/ffmpeg_source.hpp
@@ -18,7 +18,7 @@ class FFMpegSource : public SampleSource
 {
   AVFormatContext *FmtCtx;
   AVCodecContext *CodecCtx;
-  int StreamNum;
+  unsigned int StreamNum;
 
   std::vector<uint8_t> storage;
 
diff --git a/sound/tests/Makefile b/sound/tests/Makefile
index a23f18025..cb647db73 100644
--- a/sound/tests/Makefile
+++ b/sound/tests/Makefile
@@ -1,4 +1,4 @@
-GCC=g++ -I../
+GCC=g++ -I../ -Wall
 
 all: audiere_source_test ffmpeg_source_test openal_output_test openal_audiere_test openal_ffmpeg_test
 
diff --git a/stream/tests/Makefile b/stream/tests/Makefile
index 924a252c3..e64b90076 100644
--- a/stream/tests/Makefile
+++ b/stream/tests/Makefile
@@ -1,4 +1,4 @@
-GCC=g++ -I../
+GCC=g++ -I../ -Wall
 
 all: ogre_client_test audiere_client_test memory_server_test buffer_filter_test file_server_test slice_filter_test file_write_test
 
diff --git a/vfs/clients/ogre_archive.hpp b/vfs/clients/ogre_archive.hpp
index 77191881a..7cba6cfc8 100644
--- a/vfs/clients/ogre_archive.hpp
+++ b/vfs/clients/ogre_archive.hpp
@@ -22,7 +22,9 @@ class MangleArchive : public Ogre::Archive
  public:
   MangleArchive(VFSPtr _vfs, const std::string &name,
                 const std::string &archType = "Mangle")
-    : vfs(_vfs), Ogre::Archive(name, archType) {}
+    : Ogre::Archive(name, archType)
+    , vfs(_vfs)
+  {}
 
   bool isCaseSensitive() const { return vfs->isCaseSensitive; }
 
diff --git a/vfs/tests/Makefile b/vfs/tests/Makefile
index e0577b64e..a5d1d1712 100644
--- a/vfs/tests/Makefile
+++ b/vfs/tests/Makefile
@@ -1,4 +1,4 @@
-GCC=g++ -I../
+GCC=g++ -I../ -Wall
 
 all: dummy_test ogre_client_test ogre_resource_test ogre_server_test physfs_server_test
 
diff --git a/vfs/tests/dummy_test.cpp b/vfs/tests/dummy_test.cpp
index 8d7fc7dd6..541010c6a 100644
--- a/vfs/tests/dummy_test.cpp
+++ b/vfs/tests/dummy_test.cpp
@@ -17,7 +17,7 @@ void print(FileInfoPtr inf) { print(*inf); }
 
 void print(FileInfoList &lst)
 {
-  for(int i=0; i<lst.size(); i++)
+  for(unsigned i=0; i<lst.size(); i++)
     print(lst[i]);
 }
 void print(FileInfoListPtr lst) { print(*lst); }