diff --git a/grbl/gcode.h b/grbl/gcode.h
index 00b1347..983f1d3 100644
--- a/grbl/gcode.h
+++ b/grbl/gcode.h
@@ -19,6 +19,9 @@
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "nuts_bolts.h"
+#include <stdint.h>
+
 #ifndef gcode_h
 #define gcode_h
 
diff --git a/grbl/jog.h b/grbl/jog.h
index c726246..a53502f 100644
--- a/grbl/jog.h
+++ b/grbl/jog.h
@@ -22,6 +22,7 @@
 #define jog_h
 
 #include "gcode.h"
+#include "planner.h"
 
 // System motion line numbers must be zero.
 #define JOG_LINE_NUMBER 0