diff --git a/library/proto/Basic.proto b/library/proto/Basic.proto
index c387bef01..f4ca82636 100644
--- a/library/proto/Basic.proto
+++ b/library/proto/Basic.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;
diff --git a/library/proto/BasicApi.proto b/library/proto/BasicApi.proto
index a5a07aa1c..3c0fb1a10 100644
--- a/library/proto/BasicApi.proto
+++ b/library/proto/BasicApi.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;
diff --git a/library/proto/CoreProtocol.proto b/library/proto/CoreProtocol.proto
index e53078875..b2f7d2be8 100644
--- a/library/proto/CoreProtocol.proto
+++ b/library/proto/CoreProtocol.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;
diff --git a/plugins/dig-now.cpp b/plugins/dig-now.cpp
index 365be3313..1bca6784c 100644
--- a/plugins/dig-now.cpp
+++ b/plugins/dig-now.cpp
@@ -708,8 +708,8 @@ static void create_boulders(color_ostream &out,
 
         size_t remaining_items = coords.size();
         while (remaining_items > 0) {
-            int16_t batch_size = min(remaining_items,
-                                     static_cast<size_t>(INT16_MAX));
+            int16_t batch_size = std::min(remaining_items,
+                                          static_cast<size_t>(INT16_MAX));
             prod->count = batch_size;
             remaining_items -= batch_size;
             prod->produce(unit, &out_products, &out_items, &in_reag, &in_items,
@@ -725,7 +725,7 @@ static void create_boulders(color_ostream &out,
                          material.toString().c_str(),
                          ENUM_KEY_STR(item_type, prod->item_type).c_str(),
                          coords.size(), num_items);
-            num_items = min(num_items, entry.second.size());
+            num_items = std::min(num_items, entry.second.size());
         }
 
         for (size_t i = 0; i < num_items; ++i) {
diff --git a/plugins/proto/AdventureControl.proto b/plugins/proto/AdventureControl.proto
index 840576c2b..6fc6020a7 100644
--- a/plugins/proto/AdventureControl.proto
+++ b/plugins/proto/AdventureControl.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package AdventureControl;
 
diff --git a/plugins/proto/DwarfControl.proto b/plugins/proto/DwarfControl.proto
index ee750f8bc..2babc9961 100644
--- a/plugins/proto/DwarfControl.proto
+++ b/plugins/proto/DwarfControl.proto
@@ -1,5 +1,6 @@
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 syntax = "proto2";
+
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package DwarfControl;
 
 option optimize_for = LITE_RUNTIME;
diff --git a/plugins/proto/ItemdefInstrument.proto b/plugins/proto/ItemdefInstrument.proto
index 0b64eb6d1..45c35f693 100644
--- a/plugins/proto/ItemdefInstrument.proto
+++ b/plugins/proto/ItemdefInstrument.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package ItemdefInstrument;
 
diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto
index a128a162f..a64e64d0b 100644
--- a/plugins/proto/RemoteFortressReader.proto
+++ b/plugins/proto/RemoteFortressReader.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package RemoteFortressReader;
 
diff --git a/plugins/proto/isoworldremote.proto b/plugins/proto/isoworldremote.proto
index c972e98a8..f53aa6aea 100644
--- a/plugins/proto/isoworldremote.proto
+++ b/plugins/proto/isoworldremote.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Describes a very basic material structure for the map embark
 package isoworldremote;
 
diff --git a/plugins/proto/rename.proto b/plugins/proto/rename.proto
index d6059a6b0..4391ecc10 100644
--- a/plugins/proto/rename.proto
+++ b/plugins/proto/rename.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;
diff --git a/plugins/proto/ui_sidebar_mode.proto b/plugins/proto/ui_sidebar_mode.proto
index af9dbabd7..df81d6bd2 100644
--- a/plugins/proto/ui_sidebar_mode.proto
+++ b/plugins/proto/ui_sidebar_mode.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package proto.enums.ui_sidebar_mode;
 
diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index b6511d759..cf3bfa349 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -33,6 +33,9 @@
 #include <fstream>
 
 using std::endl;
+using std::string;
+using std::vector;
+
 using namespace DFHack;
 using namespace df::enums;
 using namespace google::protobuf;
diff --git a/plugins/stockpiles/proto/stockpiles.proto b/plugins/stockpiles/proto/stockpiles.proto
index 5868586f4..992989efd 100644
--- a/plugins/stockpiles/proto/stockpiles.proto
+++ b/plugins/stockpiles/proto/stockpiles.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfstockpiles;
 
 option optimize_for = LITE_RUNTIME;