Revert "No more command.h and command-internals.h"

This reverts commit 8dbbd1d345542de51641188f2380caacc8ee6178.