diff --git a/COMPILING.md b/COMPILING.md
index 64ad28c9737..b1a5d45f856 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -21,11 +21,11 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.
    The GNU Make needs to be version 3.81 or higher.
    On Debian-like distributions, do
    ```
-   apt-get install g++ gcc flex bison make git libwww-perl patch
+   apt-get install g++ gcc flex bison make git libwww-perl patch openjdk-7-jdk
    ```
    On Red Hat/Fedora or derivates, do
    ```
-   yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6
+   yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel
    ```
    Note that you need g++ version 4.9 or newer.
 2. As a user, get the CBMC source via
@@ -91,7 +91,7 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.
 
 1. As root, get the necessary tools:
    ```
-   pkg install bash gmake git www/p5-libwww patch flex bison
+   pkg install bash gmake git www/p5-libwww patch flex bison openjdk
    ```
 2. As a user, get the CBMC source via
    ```
@@ -186,11 +186,11 @@ require manual modification of build files.
    --version`. To install all build dependencies:
    - On Debian-like distributions, do
      ```
-     apt-get install cmake g++ gcc flex bison make git libwww-perl patch
+     apt-get install cmake g++ gcc flex bison make git libwww-perl patch openjdk-7-jdk
      ```
    - On Red Hat/Fedora or derivates, do
      ```
-     yum install cmake gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6
+     yum install cmake gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel
      ```
    - On macOS, do
      ```
diff --git a/scripts/perf-test/codebuild-glucose.yaml b/scripts/perf-test/codebuild-glucose.yaml
index aaba1a51af1..7cb1b8d1c73 100644
--- a/scripts/perf-test/codebuild-glucose.yaml
+++ b/scripts/perf-test/codebuild-glucose.yaml
@@ -66,7 +66,7 @@ Resources:
                                 - apt-get install -y software-properties-common
                                 - add-apt-repository ppa:ubuntu-toolchain-r/test
                                 - apt-get update -y
-                                - apt-get install -y libwww-perl g++-5 flex bison git
+                                - apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
                                 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
                                 - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
                         build:
@@ -109,7 +109,7 @@ Resources:
                                 - apt-get install -y software-properties-common
                                 - add-apt-repository ppa:ubuntu-toolchain-r/test
                                 - apt-get update -y
-                                - apt-get install -y libwww-perl g++-5 flex bison git
+                                - apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
                                 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
                                 - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
                         build:
diff --git a/scripts/perf-test/codebuild.yaml b/scripts/perf-test/codebuild.yaml
index 45663349b61..a0dab340246 100644
--- a/scripts/perf-test/codebuild.yaml
+++ b/scripts/perf-test/codebuild.yaml
@@ -66,7 +66,7 @@ Resources:
                                 - apt-get install -y software-properties-common
                                 - add-apt-repository ppa:ubuntu-toolchain-r/test
                                 - apt-get update -y
-                                - apt-get install -y libwww-perl g++-5 flex bison git
+                                - apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
                                 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
                                 - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
                         build:
@@ -108,7 +108,7 @@ Resources:
                                 - apt-get install -y software-properties-common
                                 - add-apt-repository ppa:ubuntu-toolchain-r/test
                                 - apt-get update -y
-                                - apt-get install -y libwww-perl g++-5 flex bison git
+                                - apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
                                 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
                                 - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
                         build:
diff --git a/src/java_bytecode/java_bytecode_parse_tree.h b/src/java_bytecode/java_bytecode_parse_tree.h
index 42a04f5200b..09d96ac0356 100644
--- a/src/java_bytecode/java_bytecode_parse_tree.h
+++ b/src/java_bytecode/java_bytecode_parse_tree.h
@@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H
 
 #include <set>
+#include <map>
 
 #include <util/optional.h>
 #include <util/std_code.h>
diff --git a/src/java_bytecode/java_enum_static_init_unwind_handler.cpp b/src/java_bytecode/java_enum_static_init_unwind_handler.cpp
index 2c196ff5a42..d9d48bbf9e7 100644
--- a/src/java_bytecode/java_enum_static_init_unwind_handler.cpp
+++ b/src/java_bytecode/java_enum_static_init_unwind_handler.cpp
@@ -11,6 +11,7 @@ Author: Chris Smowton, chris.smowton@diffblue.com
 
 #include "java_enum_static_init_unwind_handler.h"
 
+#include <util/invariant.h>
 #include <util/suffix.h>
 
 /// Unwind handler that special-cases the clinit (static initializer) functions