blockiness: cleanup includes and add statics

Change-Id: I26c53f8e74cf5431fb3179af5d480e4e9f3d8f32
2 files changed